Renamed Avatar to ScenePresence to avoid clash with libsl Avatar class.

Added ThirdPartyLicenses folder containing the licenses for the various third party libraries we use.
Plus some other small changes.

3 files changed, 6 insertions, 5 deletions

diff --git a/OpenSim/OpenSim.RegionServer/ClientView.API.cs b/OpenSim/OpenSim.RegionServer/ClientView.API.cs
index ee6d741..1895fb9 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView.API.cs
+++ b/OpenSim/OpenSim.RegionServer/ClientView.API.cs
@@ -483,13 +483,13 @@ namespace OpenSim
         /// <param name="avatarID"></param>

         /// <param name="avatarLocalID"></param>

         /// <param name="Pos"></param>

-        public void SendAvatarData(RegionInfo regionInfo, string firstName, string lastName, LLUUID avatarID, uint avatarLocalID, LLVector3 Pos)

+        public void SendAvatarData(ulong regionHandle, string firstName, string lastName, LLUUID avatarID, uint avatarLocalID, LLVector3 Pos)

         {

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

             //send a objectupdate packet with information about the clients avatar

 

             ObjectUpdatePacket objupdate = new ObjectUpdatePacket();

-            objupdate.RegionData.RegionHandle = regionInfo.RegionHandle;

+            objupdate.RegionData.RegionHandle = regionHandle;

             objupdate.RegionData.TimeDilation = 64096;

             objupdate.ObjectData = new libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock[1];

             objupdate.ObjectData[0] = this.CreateDefaultAvatarPacket();

diff --git a/OpenSim/OpenSim.RegionServer/ClientView.cs b/OpenSim/OpenSim.RegionServer/ClientView.cs
index b089bdc..5d15ae3 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView.cs
+++ b/OpenSim/OpenSim.RegionServer/ClientView.cs
@@ -71,7 +71,7 @@ namespace OpenSim
 

         private AgentAssetUpload UploadAssets;

         private LLUUID newAssetFolder = LLUUID.Zero;

-        private bool debug = false;

+        private bool debug = true;

         protected IWorld m_world;

         private Dictionary<uint, ClientView> m_clientThreads;

         private AssetCache m_assetCache;

@@ -124,7 +124,7 @@ namespace OpenSim
             }

 

             this.m_inventoryCache.ClientLeaving(this.AgentID, null);

-            m_world.RemoveAvatar(this.AgentId);

+            m_world.RemoveClient(this.AgentId);

 

             m_clientThreads.Remove(this.CircuitCode);

             m_networkServer.RemoveClientCircuit(this.CircuitCode);

@@ -211,7 +211,7 @@ namespace OpenSim
         protected virtual void InitNewClient()

         {

             OpenSim.Framework.Console.MainLog.Instance.Verbose( "OpenSimClient.cs:InitNewClient() - Adding viewer agent to world");

-            this.m_world.AddNewAvatar(this, this.AgentID, false);

+            this.m_world.AddNewClient(this, this.AgentID, false);

         }

 

         protected virtual void AuthUser()

diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
index 23eca3a..520f826 100644
--- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
+++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
@@ -38,6 +38,7 @@
                 <include name="../../bin/OpenSim.Framework.Console.dll" />

                 <include name="../../bin/OpenSim.GenericConfig.Xml.dll" />

                 <include name="../../bin/OpenSim.Physics.Manager.dll" />

+                <include name="../../bin/OpenSim.Region.dll" />

                 <include name="../../bin/OpenSim.Servers.dll" />

                 <include name="../../bin/OpenSim.Terrain.BasicTerrain.dll" />

                 <include name="System.dll" />