* 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)

6 files changed, 92 insertions, 85 deletions

diff --git a/Common/OpenSim.Framework/Interfaces/IClientAPI.cs b/Common/OpenSim.Framework/Interfaces/IClientAPI.cs
index d5b2ae4..9d28dab 100644
--- a/Common/OpenSim.Framework/Interfaces/IClientAPI.cs
+++ b/Common/OpenSim.Framework/Interfaces/IClientAPI.cs
@@ -94,6 +94,7 @@ namespace OpenSim.Framework.Interfaces
         void OutPacket(Packet newPack);

         void SendWearables(AvatarWearable[] wearables);

         void SendRegionHandshake(RegionInfo regionInfo);

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

         void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID);

         void SendLayerData(float[] map);

         void MoveAgentIntoRegion(RegionInfo regInfo);

diff --git a/Common/OpenSim.Framework/Interfaces/IWorld.cs b/Common/OpenSim.Framework/Interfaces/IWorld.cs
index ab2d63d..eee30b7 100644
--- a/Common/OpenSim.Framework/Interfaces/IWorld.cs
+++ b/Common/OpenSim.Framework/Interfaces/IWorld.cs
@@ -10,6 +10,9 @@ namespace OpenSim.Framework.Interfaces
     {

         void AddNewAvatar(IClientAPI remoteClient, LLUUID agentID, bool child);

         void RemoveAvatar(LLUUID agentID);

-        RegionInfo GetRegionInfo();

+        

+        RegionInfo RegionInfo { get; }

+        object SyncRoot { get; }

+        uint NextLocalId { get; }

     }

 }

diff --git a/Common/OpenSim.Framework/OpenSim.Framework.csproj b/Common/OpenSim.Framework/OpenSim.Framework.csproj
index 7e14e6a..f72c5f5 100644
--- a/Common/OpenSim.Framework/OpenSim.Framework.csproj
+++ b/Common/OpenSim.Framework/OpenSim.Framework.csproj
@@ -90,58 +90,49 @@
     </ProjectReference>

   </ItemGroup>

   <ItemGroup>

-    <Compile Include="RegionCommsHostBase.cs">

-      <SubType>Code</SubType>

-    </Compile>

     <Compile Include="AgentInventory.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="AuthenticateSessionBase.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Util.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="Remoting.cs">

+    <Compile Include="BlockingQueue.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="UserProfileManagerBase.cs">

+    <Compile Include="IRegionCommsHost.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="LoginService.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="IRegionCommsHost.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="UserProfileManager.cs">

+    <Compile Include="RegionCommsHostBase.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="BlockingQueue.cs">

+    <Compile Include="Remoting.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="UserProfile.cs">

+    <Compile Include="SimProfile.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="SimProfileBase.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="SimProfile.cs">

+    <Compile Include="UserProfile.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Interfaces\LocalGridBase.cs">

+    <Compile Include="UserProfileManager.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Interfaces\RemoteGridBase.cs">

+    <Compile Include="UserProfileManagerBase.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Interfaces\IUserServer.cs">

+    <Compile Include="Util.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="Interfaces\IAssetServer.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Interfaces\IWorld.cs">

+    <Compile Include="Interfaces\IClientAPI.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="Interfaces\IGridServer.cs">

@@ -150,61 +141,64 @@
     <Compile Include="Interfaces\ILocalStorage.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Interfaces\IClientAPI.cs">

+    <Compile Include="Interfaces\IUserServer.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Interfaces\Scripting\IScriptEngine.cs">

+    <Compile Include="Interfaces\IWorld.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Interfaces\Scripting\IScriptAPI.cs">

+    <Compile Include="Interfaces\LocalGridBase.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Interfaces\Remoting\IProxyServerHost.cs">

+    <Compile Include="Interfaces\RemoteGridBase.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Interfaces\Remoting\IProxyServerClient.cs">

+    <Compile Include="Interfaces\Config\IGenericConfig.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Interfaces\Remoting\IRegionGridClient.cs">

+    <Compile Include="Interfaces\Config\IGridConfig.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Interfaces\Remoting\IGridServerHost.cs">

+    <Compile Include="Interfaces\Config\IUserConfig.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Interfaces\Remoting\IRegionSimHost.cs">

+    <Compile Include="Interfaces\Remoting\IGridServerHost.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Interfaces\Remoting\RegionGridClientBase.cs">

+    <Compile Include="Interfaces\Remoting\IProxyServerClient.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Interfaces\Config\IGenericConfig.cs">

+    <Compile Include="Interfaces\Remoting\IProxyServerHost.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Interfaces\Config\IUserConfig.cs">

+    <Compile Include="Interfaces\Remoting\IRegionGridClient.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Interfaces\Config\IGridConfig.cs">

+    <Compile Include="Interfaces\Remoting\IRegionSimHost.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Properties\AssemblyInfo.cs">

+    <Compile Include="Interfaces\Remoting\RegionGridClientBase.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Types\NeighbourInfo.cs">

+    <Compile Include="Interfaces\Scripting\IScriptAPI.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Types\NetworkServersInfo.cs">

+    <Compile Include="Interfaces\Scripting\IScriptEngine.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Types\RegionInfo.cs">

+    <Compile Include="Properties\AssemblyInfo.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Types\ParcelData.cs">

+    <Compile Include="Types\AgentCiruitData.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="Types\AgentWearable.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Types\PrimData.cs">

+    <Compile Include="Types\AssetBase.cs">

+      <SubType>Code</SubType>

+    </Compile>

+    <Compile Include="Types\AssetLandmark.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="Types\AssetStorage.cs">

@@ -213,19 +207,25 @@
     <Compile Include="Types\EstateSettings.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Types\OSVector3.cs">

+    <Compile Include="Types\Login.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Types\AgentCiruitData.cs">

+    <Compile Include="Types\NeighbourInfo.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Types\Login.cs">

+    <Compile Include="Types\NetworkServersInfo.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Types\AssetLandmark.cs">

+    <Compile Include="Types\OSVector3.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Types\AssetBase.cs">

+    <Compile Include="Types\ParcelData.cs">

+      <SubType>Code</SubType>

+    </Compile>

+    <Compile Include="Types\PrimData.cs">

+      <SubType>Code</SubType>

+    </Compile>

+    <Compile Include="Types\RegionInfo.cs">

       <SubType>Code</SubType>

     </Compile>

   </ItemGroup>

diff --git a/Common/OpenSim.Framework/OpenSim.Framework.csproj.user b/Common/OpenSim.Framework/OpenSim.Framework.csproj.user
deleted file mode 100644
index 082d673..0000000
--- a/Common/OpenSim.Framework/OpenSim.Framework.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/Common/OpenSim.Framework/OpenSim.Framework.dll.build b/Common/OpenSim.Framework/OpenSim.Framework.dll.build
index 2678e54..7ead9a8 100644
--- a/Common/OpenSim.Framework/OpenSim.Framework.dll.build
+++ b/Common/OpenSim.Framework/OpenSim.Framework.dll.build
@@ -11,52 +11,52 @@
             <resources prefix="OpenSim.Framework" dynamicprefix="true" >

             </resources>

             <sources failonempty="true">

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

                 <include name="AgentInventory.cs" />

                 <include name="AuthenticateSessionBase.cs" />

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

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

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

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

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

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

                 <include name="BlockingQueue.cs" />

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

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

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

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

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

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

                 <include name="SimProfile.cs" />

-                <include name="Interfaces/LocalGridBase.cs" />

-                <include name="Interfaces/RemoteGridBase.cs" />

-                <include name="Interfaces/IUserServer.cs" />

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

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

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

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

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

                 <include name="Interfaces/IAssetServer.cs" />

-                <include name="Interfaces/IWorld.cs" />

+                <include name="Interfaces/IClientAPI.cs" />

                 <include name="Interfaces/IGridServer.cs" />

                 <include name="Interfaces/ILocalStorage.cs" />

-                <include name="Interfaces/IClientAPI.cs" />

-                <include name="Interfaces/Scripting/IScriptEngine.cs" />

-                <include name="Interfaces/Scripting/IScriptAPI.cs" />

-                <include name="Interfaces/Remoting/IProxyServerHost.cs" />

+                <include name="Interfaces/IUserServer.cs" />

+                <include name="Interfaces/IWorld.cs" />

+                <include name="Interfaces/LocalGridBase.cs" />

+                <include name="Interfaces/RemoteGridBase.cs" />

+                <include name="Interfaces/Config/IGenericConfig.cs" />

+                <include name="Interfaces/Config/IGridConfig.cs" />

+                <include name="Interfaces/Config/IUserConfig.cs" />

+                <include name="Interfaces/Remoting/IGridServerHost.cs" />

                 <include name="Interfaces/Remoting/IProxyServerClient.cs" />

+                <include name="Interfaces/Remoting/IProxyServerHost.cs" />

                 <include name="Interfaces/Remoting/IRegionGridClient.cs" />

-                <include name="Interfaces/Remoting/IGridServerHost.cs" />

                 <include name="Interfaces/Remoting/IRegionSimHost.cs" />

                 <include name="Interfaces/Remoting/RegionGridClientBase.cs" />

-                <include name="Interfaces/Config/IGenericConfig.cs" />

-                <include name="Interfaces/Config/IUserConfig.cs" />

-                <include name="Interfaces/Config/IGridConfig.cs" />

+                <include name="Interfaces/Scripting/IScriptAPI.cs" />

+                <include name="Interfaces/Scripting/IScriptEngine.cs" />

                 <include name="Properties/AssemblyInfo.cs" />

-                <include name="Types/NeighbourInfo.cs" />

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

-                <include name="Types/RegionInfo.cs" />

-                <include name="Types/ParcelData.cs" />

+                <include name="Types/AgentCiruitData.cs" />

                 <include name="Types/AgentWearable.cs" />

-                <include name="Types/PrimData.cs" />

+                <include name="Types/AssetBase.cs" />

+                <include name="Types/AssetLandmark.cs" />

                 <include name="Types/AssetStorage.cs" />

                 <include name="Types/EstateSettings.cs" />

-                <include name="Types/OSVector3.cs" />

-                <include name="Types/AgentCiruitData.cs" />

                 <include name="Types/Login.cs" />

-                <include name="Types/AssetLandmark.cs" />

-                <include name="Types/AssetBase.cs" />

+                <include name="Types/NeighbourInfo.cs" />

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

+                <include name="Types/OSVector3.cs" />

+                <include name="Types/ParcelData.cs" />

+                <include name="Types/PrimData.cs" />

+                <include name="Types/RegionInfo.cs" />

             </sources>

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

                 <lib>

diff --git a/Common/OpenSim.Framework/Types/AgentWearable.cs b/Common/OpenSim.Framework/Types/AgentWearable.cs
index b7fbe3c..49c1292 100644
--- a/Common/OpenSim.Framework/Types/AgentWearable.cs
+++ b/Common/OpenSim.Framework/Types/AgentWearable.cs
@@ -14,5 +14,20 @@ namespace OpenSim.Framework.Types
         {

 

         }

+

+        public static AvatarWearable[] DefaultWearables

+        {

+            get

+            {

+                AvatarWearable[] defaultWearables =  new AvatarWearable[13]; //should be 13 of these

+                for (int i = 0; i < 13; i++)

+                {

+                    defaultWearables[i] = new AvatarWearable();

+                }

+                defaultWearables[0].AssetID = new LLUUID("66c41e39-38f9-f75a-024e-585989bfab73");

+                defaultWearables[0].ItemID = LLUUID.Random();

+                return defaultWearables;

+            }

+        }

     }

 }