Some more code refactoring, plus a restructuring of the directories so that the Grid servers can be a separate solution to the region server.

1 files changed, 4 insertions, 3 deletions

diff --git a/OpenSim.RegionServer/world/Avatar.cs b/OpenSim-Source/OpenSim.RegionServer/world/Avatar.cs
index 4e90364..680d059 100644
--- a/OpenSim.RegionServer/world/Avatar.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/world/Avatar.cs
@@ -6,6 +6,7 @@ using libsecondlife;
 using libsecondlife.Packets;

 using OpenSim.Physics.Manager;

 using OpenSim.Framework.Inventory;

+using OpenSim.Framework.Interfaces;

 using Axiom.MathLib;

 

 namespace OpenSim.world

@@ -66,11 +67,11 @@ namespace OpenSim.world
 

             //register for events

             ControllingClient.OnRequestWearables += new ClientView.GenericCall(this.SendOurAppearance);

-            ControllingClient.OnSetAppearance += new ClientView.SetAppearance(this.SetAppearance);

+            ControllingClient.OnSetAppearance += new SetAppearance(this.SetAppearance);

             ControllingClient.OnCompleteMovementToRegion += new ClientView.GenericCall2(this.CompleteMovement);

             ControllingClient.OnCompleteMovementToRegion += new ClientView.GenericCall2(this.SendInitialPosition);

             ControllingClient.OnAgentUpdate += new ClientView.GenericCall3(this.HandleAgentUpdate);

-            ControllingClient.OnStartAnim += new ClientView.StartAnim(this.SendAnimPack);

+            ControllingClient.OnStartAnim += new StartAnim(this.SendAnimPack);

 

         }

 

@@ -349,7 +350,7 @@ namespace OpenSim.world
         }

 

         //really really should be moved somewhere else (RegionInfo.cs ?)

-        public void SendRegionHandshake(World RegionInfo)

+        public void SendRegionHandshake(World regionInfo)

         {

             OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.VERBOSE,"Avatar.cs:SendRegionHandshake() - Creating empty RegionHandshake packet");

             System.Text.Encoding _enc = System.Text.Encoding.ASCII;