RAD-184: World -> Teleport Home not working

* sync log4net with libomv trunk
* update version number to 1.23 dev

git-svn-id: https://radegast.googlecode.com/svn/trunk@718 f7a694da-4d33-11de-9ad6-1127a62b9fcd

diff --git a/Radegast/Core/RadegastInstance.cs b/Radegast/Core/RadegastInstance.cs
index 77609f2..28e71ff 100644 (file)
--- a/Radegast/Core/RadegastInstance.cs
+++ b/Radegast/Core/RadegastInstance.cs
@@ -293,7 +293,7 @@ namespace Radegast
             client.Assets.Cache.AutoPruneEnabled = false;
 
             client.Throttle.Total = 5000000f;
-            client.Settings.THROTTLE_OUTGOING_PACKETS = true;
+            client.Settings.THROTTLE_OUTGOING_PACKETS = false;
             client.Settings.LOGIN_TIMEOUT = 120 * 1000;
             client.Settings.SIMULATOR_TIMEOUT = 120 * 1000;
             client.Settings.MAX_CONCURRENT_TEXTURE_DOWNLOADS = 20;

diff --git a/Radegast/GUI/Dialogs/MainForm.Designer.cs b/Radegast/GUI/Dialogs/MainForm.Designer.cs
index 3de0836..6b31346 100644 (file)
--- a/Radegast/GUI/Dialogs/MainForm.Designer.cs
+++ b/Radegast/GUI/Dialogs/MainForm.Designer.cs
@@ -345,6 +345,7 @@ namespace Radegast
             this.tmnuTeleportHome.ShortcutKeyDisplayString = "Ctrl-Shift-H";
             this.tmnuTeleportHome.Size = new System.Drawing.Size(223, 22);
             this.tmnuTeleportHome.Text = "Teleport Home";
+            this.tmnuTeleportHome.Click += new System.EventHandler(this.tmnuTeleportHome_Click);
             // 
             // toolStripMenuItem5
             // 

diff --git a/Radegast/GUI/Dialogs/MainForm.cs b/Radegast/GUI/Dialogs/MainForm.cs
index da13824..f01ff76 100644 (file)
--- a/Radegast/GUI/Dialogs/MainForm.cs
+++ b/Radegast/GUI/Dialogs/MainForm.cs
@@ -1309,11 +1309,33 @@ namespace Radegast
             }
         }
 
+        int nr_reg = 0;
+        int nr_agent = 0;
+
         // Menu item for testing out stuff
         private void testToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            client.Settings.SEND_AGENT_THROTTLE = true;
-            client.Settings.SEND_AGENT_UPDATES = true;
+            if (nr_reg > 0)
+            {
+                Logger.Log("Number of regions: " + nr_reg.ToString() + " agents: " + nr_agent.ToString(), Helpers.LogLevel.Info);
+                nr_reg = 0;
+                nr_agent = 0;
+                client.Grid.GridRegion -= new EventHandler<GridRegionEventArgs>(Grid_GridRegion);
+                return;
+            }
+
+            client.Grid.GridRegion += new EventHandler<GridRegionEventArgs>(Grid_GridRegion);
+            client.Grid.RequestMainlandSims(GridLayerType.Objects);
+        }
+
+        void Grid_GridRegion(object sender, GridRegionEventArgs e)
+        {
+            nr_reg++;
+            if ((nr_reg % 100) == 0)
+            {
+                nr_agent += e.Region.Agents;
+                Logger.Log("Number of regions: " + nr_reg.ToString() + " agents: " + nr_agent.ToString(), Helpers.LogLevel.Info);
+            }
         }
 
         private void reloadInventoryToolStripMenuItem_Click(object sender, EventArgs e)
@@ -1360,6 +1382,12 @@ namespace Radegast
             tmnuExit_Click(this, EventArgs.Empty);
         }
 
+        private void tmnuTeleportHome_Click(object sender, EventArgs e)
+        {
+            TabConsole.DisplayNotificationInChat("Teleporting home...");
+            client.Self.RequestTeleport(UUID.Zero);
+        }
         #endregion
+
     }
 }
\ No newline at end of file

diff --git a/Radegast/Properties/AssemblyInfo.cs b/Radegast/Properties/AssemblyInfo.cs
index 2274270..5d2dc9f 100644 (file)
--- a/Radegast/Properties/AssemblyInfo.cs
+++ b/Radegast/Properties/AssemblyInfo.cs
@@ -59,5 +59,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("1.22.715.*")]
-[assembly: AssemblyFileVersion("1.22.715.0")]
+[assembly: AssemblyVersion("1.23.0.*")]
+[assembly: AssemblyFileVersion("1.23.0.0")]

diff --git a/Radegast/Properties/Resources.Designer.cs b/Radegast/Properties/Resources.Designer.cs
index 7bae6d2..dbb10e5 100644 (file)
--- a/Radegast/Properties/Resources.Designer.cs
+++ b/Radegast/Properties/Resources.Designer.cs
@@ -636,7 +636,7 @@ namespace Radegast.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Radegast 1.22.
+        ///   Looks up a localized string similar to Radegast 1.23.
         /// </summary>
         public static string RadegastTitle {
             get {

diff --git a/Radegast/Properties/Resources.resx b/Radegast/Properties/Resources.resx
index e244dd3..ec97c03 100644 (file)
--- a/Radegast/Properties/Resources.resx
+++ b/Radegast/Properties/Resources.resx
@@ -182,7 +182,7 @@
     <value>../Resources/inv_folder_animation.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
   </data>\r
   <data name="RadegastTitle" xml:space="preserve">\r
-    <value>Radegast 1.22</value>\r
+    <value>Radegast 1.23</value>\r
   </data>\r
   <data name="inv_folder_plain_closed" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
     <value>../Resources/inv_folder_plain_closed.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r

diff --git a/Radegast/Radegast.csproj b/Radegast/Radegast.csproj
index ea07c0c..906b47b 100644 (file)
--- a/Radegast/Radegast.csproj
+++ b/Radegast/Radegast.csproj
@@ -80,7 +80,7 @@
       <HintPath>assemblies\CommandLine.dll</HintPath>\r
     </Reference>\r
     <Reference Include="fmodex-dotnet, Version=4.26.7.0, Culture=neutral, processorArchitecture=MSIL" />\r
-    <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL" />\r
+    <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, processorArchitecture=MSIL" />\r
     <Reference Include="System" />\r
     <Reference Include="System.Core">\r
       <RequiredTargetFramework>3.5</RequiredTargetFramework>\r

diff --git a/Radegast/assemblies/log4net.dll b/Radegast/assemblies/log4net.dll
index ffc57e1..974b493 100644 (file)
Binary files a/Radegast/assemblies/log4net.dll and b/Radegast/assemblies/log4net.dll differ

diff --git a/Radegast/radegast.nsi b/Radegast/radegast.nsi
index c41839e..947275c 100644 (file)
Binary files a/Radegast/radegast.nsi and b/Radegast/radegast.nsi differ