* LogFile now defaults to "{apptype}.log"

* cleaned away suo and user files.
* added handy string chat variety to the API
* Moved LockPhysicsEngine on World to SyncRoot on IWorld
* Introduced NextLocalId instead of World fuggliness.
* Transformed GetRegionInfo to Property on IWorld for great justice
* Extracted default wearables (good to have)
* Deleted unused BaseServer
* Used IWorld instead of World wherever possible
* The client constructor's not getting unused port any longer.
* Extracted ClientView factoring so PacketServer can be tweaked.
* Added SendLayerData to World
* Made WorldBase abstract and cleaned it up a bit
* added OpenGrid.Framework.Communications.dll.build and OpenSim.World.dll.build to svn
* Added code for two examples (but not in prebuild yet)

7 files changed, 54 insertions, 49 deletions

diff --git a/OpenSim/OpenSim.RegionServer/AuthenticateSessionsLocal.cs b/OpenSim/OpenSim.RegionServer/AuthenticateSessionsLocal.cs
index 91772f8..4db7ccb 100644
--- a/OpenSim/OpenSim.RegionServer/AuthenticateSessionsLocal.cs
+++ b/OpenSim/OpenSim.RegionServer/AuthenticateSessionsLocal.cs
@@ -13,7 +13,13 @@ namespace OpenSim
         {

 

         }

-

+    

+        public bool AddNewSessionHandler(ulong regionHandle, Login loginData)

+        {

+            AddNewSession( loginData );

+            return true;

+        }

+        

         public void AddNewSession(Login loginData)

         {

             AgentCircuitData agent = new AgentCircuitData();

diff --git a/OpenSim/OpenSim.RegionServer/ClientView.API.cs b/OpenSim/OpenSim.RegionServer/ClientView.API.cs
index 9e0cd48..37e27f8 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView.API.cs
+++ b/OpenSim/OpenSim.RegionServer/ClientView.API.cs
@@ -153,6 +153,11 @@ namespace OpenSim
             OutPacket(mov);

         }

 

+        public void SendChatMessage(string message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID)

+        {

+           SendChatMessage( Helpers.StringToField( message ), type, fromPos, fromName, fromAgentID); 

+        }

+        

         /// <summary>

         /// 

         /// </summary>

diff --git a/OpenSim/OpenSim.RegionServer/ClientView.cs b/OpenSim/OpenSim.RegionServer/ClientView.cs
index d970162..f9a7fe4 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView.cs
+++ b/OpenSim/OpenSim.RegionServer/ClientView.cs
@@ -70,7 +70,7 @@ namespace OpenSim
         private AgentAssetUpload UploadAssets;

         private LLUUID newAssetFolder = LLUUID.Zero;

         private bool debug = false;

-        private IWorld m_world;

+        protected IWorld m_world;

         private Dictionary<uint, ClientView> m_clientThreads;

         private AssetCache m_assetCache;

         private IGridServer m_gridServer;

@@ -78,11 +78,9 @@ namespace OpenSim
         private int cachedtextureserial = 0;

         private RegionInfo m_regionData;

         protected AuthenticateSessionsBase m_authenticateSessionsHandler;

-        protected uint serverPort = 0;

 

-        public ClientView(EndPoint remoteEP, UseCircuitCodePacket initialcirpack, Dictionary<uint, ClientView> clientThreads, IWorld world, AssetCache assetCache, PacketServer packServer, InventoryCache inventoryCache, AuthenticateSessionsBase authenSessions, uint port)

+        public ClientView(EndPoint remoteEP, UseCircuitCodePacket initialcirpack, Dictionary<uint, ClientView> clientThreads, IWorld world, AssetCache assetCache, PacketServer packServer, InventoryCache inventoryCache, AuthenticateSessionsBase authenSessions )

         {

-            this.serverPort = port;

             m_world = world;

             m_clientThreads = clientThreads;

             m_assetCache = assetCache;

diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
index 2fc6516..990b5c3 100644
--- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
+++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
@@ -124,10 +124,7 @@
     </ProjectReference>

   </ItemGroup>

   <ItemGroup>

-    <Compile Include="NetworkServersInfo.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="UDPServer.cs">

+    <Compile Include="AgentAssetUpload.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="AuthenticateSessionsLocal.cs">

@@ -136,52 +133,55 @@
     <Compile Include="AuthenticateSessionsRemote.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="OpenSimNetworkHandler.cs">

+    <Compile Include="ClientView.API.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="UserConfigUtility.cs">

+    <Compile Include="ClientView.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="ClientView.Grid.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="PacketServer.cs">

+    <Compile Include="ClientView.PacketHandlers.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="ClientView.PacketHandlers.cs">

+    <Compile Include="ClientView.ProcessPackets.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="VersionInfo.cs">

+    <Compile Include="ClientViewBase.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="AgentAssetUpload.cs">

+    <Compile Include="CommsManager.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="ClientViewBase.cs">

+    <Compile Include="NetworkServersInfo.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="RegionServerBase.cs">

+    <Compile Include="OpenSimNetworkHandler.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="CommsManager.cs">

+    <Compile Include="PacketServer.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="ClientView.cs">

+    <Compile Include="RegionServerBase.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="ClientView.API.cs">

+    <Compile Include="UDPServer.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="ClientView.ProcessPackets.cs">

+    <Compile Include="UserConfigUtility.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="CAPS\AdminWebFront.cs">

+    <Compile Include="VersionInfo.cs">

+      <SubType>Code</SubType>

+    </Compile>

+    <Compile Include="Assets\AssetCache.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="Assets\InventoryCache.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Assets\AssetCache.cs">

+    <Compile Include="CAPS\AdminWebFront.cs">

       <SubType>Code</SubType>

     </Compile>

   </ItemGroup>

diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj.user b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj.user
deleted file mode 100644
index 082d673..0000000
--- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ReferencePath>C:\sugilite\bin\</ReferencePath>

-    <LastOpenVersion>8.0.50727</LastOpenVersion>

-    <ProjectView>ProjectFiles</ProjectView>

-    <ProjectTrust>0</ProjectTrust>

-  </PropertyGroup>

-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />

-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />

-</Project>

diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
index c988025..8384407 100644
--- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
+++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
@@ -11,26 +11,26 @@
             <resources prefix="OpenSim.RegionServer" dynamicprefix="true" >

             </resources>

             <sources failonempty="true">

-                <include name="NetworkServersInfo.cs" />

-                <include name="UDPServer.cs" />

+                <include name="AgentAssetUpload.cs" />

                 <include name="AuthenticateSessionsLocal.cs" />

                 <include name="AuthenticateSessionsRemote.cs" />

-                <include name="OpenSimNetworkHandler.cs" />

-                <include name="UserConfigUtility.cs" />

+                <include name="ClientView.API.cs" />

+                <include name="ClientView.cs" />

                 <include name="ClientView.Grid.cs" />

-                <include name="PacketServer.cs" />

                 <include name="ClientView.PacketHandlers.cs" />

-                <include name="VersionInfo.cs" />

-                <include name="AgentAssetUpload.cs" />

+                <include name="ClientView.ProcessPackets.cs" />

                 <include name="ClientViewBase.cs" />

-                <include name="RegionServerBase.cs" />

                 <include name="CommsManager.cs" />

-                <include name="ClientView.cs" />

-                <include name="ClientView.API.cs" />

-                <include name="ClientView.ProcessPackets.cs" />

-                <include name="CAPS/AdminWebFront.cs" />

-                <include name="Assets/InventoryCache.cs" />

+                <include name="NetworkServersInfo.cs" />

+                <include name="OpenSimNetworkHandler.cs" />

+                <include name="PacketServer.cs" />

+                <include name="RegionServerBase.cs" />

+                <include name="UDPServer.cs" />

+                <include name="UserConfigUtility.cs" />

+                <include name="VersionInfo.cs" />

                 <include name="Assets/AssetCache.cs" />

+                <include name="Assets/InventoryCache.cs" />

+                <include name="CAPS/AdminWebFront.cs" />

             </sources>

             <references basedir="${project::get-base-directory()}">

                 <lib>

diff --git a/OpenSim/OpenSim.RegionServer/PacketServer.cs b/OpenSim/OpenSim.RegionServer/PacketServer.cs
index ab77b5d..f1ca881 100644
--- a/OpenSim/OpenSim.RegionServer/PacketServer.cs
+++ b/OpenSim/OpenSim.RegionServer/PacketServer.cs
@@ -66,9 +66,17 @@ namespace OpenSim
             

         }

 

+        protected virtual ClientView CreateNewClient(EndPoint remoteEP, UseCircuitCodePacket initialcirpack, Dictionary<uint, ClientView> clientThreads, IWorld world, AssetCache assetCache, PacketServer packServer, InventoryCache inventoryCache, AuthenticateSessionsBase authenSessions)

+        {

+            return new ClientView(remoteEP, initialcirpack, clientThreads, world, assetCache, packServer, inventoryCache, authenSessions );

+        }

+

         public virtual bool AddNewClient(EndPoint epSender, UseCircuitCodePacket useCircuit, AssetCache assetCache, InventoryCache inventoryCache, AuthenticateSessionsBase authenticateSessionsClass)

         {

-            ClientView newuser = new ClientView(epSender, useCircuit, this.ClientThreads, this._localWorld, assetCache, this, inventoryCache, authenticateSessionsClass, serverPort);

+            ClientView newuser =

+                CreateNewClient(epSender, useCircuit, ClientThreads, _localWorld, assetCache, this, inventoryCache,

+                                authenticateSessionsClass);

+            

             this.ClientThreads.Add(useCircuit.CircuitCode.Code, newuser);

             this.ClientAPIs.Add(useCircuit.CircuitCode.Code, (IClientAPI)newuser);