Started to clean up/ rewrite Primitive class , currently the new version is called Primitive2 and not used, but once it is complete then it will replace the old version.

4 files changed, 64 insertions, 62 deletions

diff --git a/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim.RegionServer/OpenSim.RegionServer.csproj
index 6c0f2da..0f47576 100644
--- a/OpenSim.RegionServer/OpenSim.RegionServer.csproj
+++ b/OpenSim.RegionServer/OpenSim.RegionServer.csproj
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

   <PropertyGroup>

     <ProjectType>Local</ProjectType>

     <ProductVersion>8.0.50727</ProductVersion>

@@ -6,7 +6,8 @@
     <ProjectGuid>{632E1BFD-0000-0000-0000-000000000000}</ProjectGuid>

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

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

-    <ApplicationIcon></ApplicationIcon>

+    <ApplicationIcon>

+    </ApplicationIcon>

     <AssemblyKeyContainerName>

     </AssemblyKeyContainerName>

     <AssemblyName>OpenSim.RegionServer</AssemblyName>

@@ -15,9 +16,11 @@
     <DefaultTargetSchema>IE50</DefaultTargetSchema>

     <DelaySign>false</DelaySign>

     <OutputType>Library</OutputType>

-    <AppDesignerFolder></AppDesignerFolder>

+    <AppDesignerFolder>

+    </AppDesignerFolder>

     <RootNamespace>OpenSim.RegionServer</RootNamespace>

-    <StartupObject></StartupObject>

+    <StartupObject>

+    </StartupObject>

     <FileUpgradeFlags>

     </FileUpgradeFlags>

   </PropertyGroup>

@@ -28,7 +31,8 @@
     <ConfigurationOverrideFile>

     </ConfigurationOverrideFile>

     <DefineConstants>TRACE;DEBUG</DefineConstants>

-    <DocumentationFile></DocumentationFile>

+    <DocumentationFile>

+    </DocumentationFile>

     <DebugSymbols>True</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>False</Optimize>

@@ -37,7 +41,8 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

     <WarningLevel>4</WarningLevel>

-    <NoWarn></NoWarn>

+    <NoWarn>

+    </NoWarn>

   </PropertyGroup>

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

     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>

@@ -46,7 +51,8 @@
     <ConfigurationOverrideFile>

     </ConfigurationOverrideFile>

     <DefineConstants>TRACE</DefineConstants>

-    <DocumentationFile></DocumentationFile>

+    <DocumentationFile>

+    </DocumentationFile>

     <DebugSymbols>False</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>True</Optimize>

@@ -55,26 +61,28 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

     <WarningLevel>4</WarningLevel>

-    <NoWarn></NoWarn>

+    <NoWarn>

+    </NoWarn>

   </PropertyGroup>

   <ItemGroup>

-    <Reference Include="System" >

+    <Reference Include="System">

       <HintPath>System.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="System.Xml" >

+    <Reference Include="System.Data" />

+    <Reference Include="System.Xml">

       <HintPath>System.Xml.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="libsecondlife.dll" >

+    <Reference Include="libsecondlife.dll">

       <HintPath>..\bin\libsecondlife.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="Axiom.MathLib.dll" >

+    <Reference Include="Axiom.MathLib.dll">

       <HintPath>..\bin\Axiom.MathLib.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="Db4objects.Db4o.dll" >

+    <Reference Include="Db4objects.Db4o.dll">

       <HintPath>..\bin\Db4objects.Db4o.dll</HintPath>

       <Private>False</Private>

     </Reference>

@@ -84,31 +92,31 @@
       <Name>OpenSim.Framework</Name>

       <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

-                        <Private>False</Private>

+      <Private>False</Private>

     </ProjectReference>

     <ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">

       <Name>OpenSim.Framework.Console</Name>

       <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

-                        <Private>False</Private>

+      <Private>False</Private>

     </ProjectReference>

     <ProjectReference Include="..\OpenSim.GenericConfig\Xml\OpenSim.GenericConfig.Xml.csproj">

       <Name>OpenSim.GenericConfig.Xml</Name>

       <Project>{E88EF749-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

-                        <Private>False</Private>

+      <Private>False</Private>

     </ProjectReference>

     <ProjectReference Include="..\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj">

       <Name>OpenSim.Physics.Manager</Name>

       <Project>{8BE16150-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

-                        <Private>False</Private>

+      <Private>False</Private>

     </ProjectReference>

     <ProjectReference Include="..\Servers\OpenSim.Servers.csproj">

       <Name>OpenSim.Servers</Name>

       <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

-                        <Private>False</Private>

+      <Private>False</Private>

     </ProjectReference>

   </ItemGroup>

   <ItemGroup>

@@ -172,6 +180,7 @@
     <Compile Include="world\Primitive.cs">

       <SubType>Code</SubType>

     </Compile>

+    <Compile Include="world\Primitive2.cs" />

     <Compile Include="world\ScriptEngine.cs">

       <SubType>Code</SubType>

     </Compile>

@@ -210,4 +219,4 @@
     <PostBuildEvent>

     </PostBuildEvent>

   </PropertyGroup>

-</Project>

+</Project>
\ No newline at end of file
diff --git a/OpenSim.RegionServer/SimClient.cs b/OpenSim.RegionServer/SimClient.cs
index 4359646..1564238 100644
--- a/OpenSim.RegionServer/SimClient.cs
+++ b/OpenSim.RegionServer/SimClient.cs
@@ -345,16 +345,19 @@ namespace OpenSim
                         AssetUploadRequestPacket request = (AssetUploadRequestPacket)Pack;

                         this.UploadAssets.HandleUploadPacket(request, request.AssetBlock.TransactionID.Combine(this.SecureSessionID));

                         break;

+                    case PacketType.RequestXfer:

+                        //Console.WriteLine(Pack.ToString());

+                        break;

                     case PacketType.SendXferPacket:

                         this.UploadAssets.HandleXferPacket((SendXferPacketPacket)Pack);

                         break;

                     case PacketType.CreateInventoryFolder:

                         CreateInventoryFolderPacket invFolder = (CreateInventoryFolderPacket)Pack;

                         m_inventoryCache.CreateNewInventoryFolder(this, invFolder.FolderData.FolderID, (ushort)invFolder.FolderData.Type, Helpers.FieldToString(invFolder.FolderData.Name), invFolder.FolderData.ParentID);

-                        Console.WriteLine(Pack.ToString());

+                        //Console.WriteLine(Pack.ToString());

                         break;

                     case PacketType.CreateInventoryItem:

-                        Console.WriteLine(Pack.ToString());

+                        //Console.WriteLine(Pack.ToString());

                         CreateInventoryItemPacket createItem = (CreateInventoryItemPacket)Pack;

                         if (createItem.InventoryBlock.TransactionID != LLUUID.Zero)

                         {

@@ -362,7 +365,7 @@ namespace OpenSim
                         }

                         else

                         {

-                            Console.Write(Pack.ToString());

+                           // Console.Write(Pack.ToString());

                             this.CreateInventoryItem(createItem);

                         }

                         break;

@@ -385,7 +388,7 @@ namespace OpenSim
                                 AssetBase asset = m_assetCache.GetAsset(update.InventoryData[i].TransactionID.Combine(this.SecureSessionID));

                                 if (asset != null)

                                 {

-                                    Console.WriteLine("updating inventory item, found asset" + asset.FullID.ToStringHyphenated() + " already in cache");

+                                   // Console.WriteLine("updating inventory item, found asset" + asset.FullID.ToStringHyphenated() + " already in cache");

                                     m_inventoryCache.UpdateInventoryItemAsset(this, update.InventoryData[i].ItemID, asset);

                                 }

                                 else

@@ -393,12 +396,12 @@ namespace OpenSim
                                     asset = this.UploadAssets.AddUploadToAssetCache(update.InventoryData[i].TransactionID);

                                     if (asset != null)

                                     {

-                                        Console.WriteLine("updating inventory item, adding asset" + asset.FullID.ToStringHyphenated() + " to cache");

+                                        //Console.WriteLine("updating inventory item, adding asset" + asset.FullID.ToStringHyphenated() + " to cache");

                                         m_inventoryCache.UpdateInventoryItemAsset(this, update.InventoryData[i].ItemID, asset);

                                     }

                                     else

                                     {

-                                        Console.WriteLine("trying to update inventory item, but asset is null");

+                                        //Console.WriteLine("trying to update inventory item, but asset is null");

                                     }

                                 }

                             }

@@ -441,24 +444,30 @@ namespace OpenSim
                         }

                         break;

                     case PacketType.UpdateTaskInventory:

-                        Console.WriteLine(Pack.ToString());

+                       // Console.WriteLine(Pack.ToString());

                         UpdateTaskInventoryPacket updatetask = (UpdateTaskInventoryPacket)Pack;

                         AgentInventory myinventory = this.m_inventoryCache.GetAgentsInventory(this.AgentID);

                         if (myinventory != null)

                         {

-                            if (myinventory.InventoryItems[updatetask.InventoryData.ItemID] != null)

+                            if (updatetask.UpdateData.Key == 0)

                             {

-                                if (myinventory.InventoryItems[updatetask.InventoryData.ItemID].Type == 7)

+                                if (myinventory.InventoryItems[updatetask.InventoryData.ItemID] != null)

                                 {

-                                    LLUUID noteaid = myinventory.InventoryItems[updatetask.InventoryData.ItemID].AssetID;

-                                    AssetBase assBase = this.m_assetCache.GetAsset(noteaid);

-                                    if (assBase != null)

+                                    if (myinventory.InventoryItems[updatetask.InventoryData.ItemID].Type == 7)

                                     {

-                                        foreach (Entity ent in m_world.Entities.Values)

+                                        LLUUID noteaid = myinventory.InventoryItems[updatetask.InventoryData.ItemID].AssetID;

+                                        AssetBase assBase = this.m_assetCache.GetAsset(noteaid);

+                                        if (assBase != null)

                                         {

-                                            if (ent.localid == updatetask.UpdateData.LocalID)

+                                            foreach (Entity ent in m_world.Entities.Values)

                                             {

-                                                this.m_world.AddScript(ent, Helpers.FieldToString(assBase.Data));

+                                                if (ent.localid == updatetask.UpdateData.LocalID)

+                                                {

+                                                    if (ent is OpenSim.world.Primitive)

+                                                    {

+                                                        this.m_world.AddScript(ent, Helpers.FieldToString(assBase.Data));

+                                                    }

+                                                }

                                             }

                                         }

                                     }

@@ -520,7 +529,7 @@ namespace OpenSim
                         return;

                     }

 

-                    OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Sending PacketAck");

+                    //OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Sending PacketAck");

 

 

                     int i = 0;

@@ -817,7 +826,7 @@ namespace OpenSim
 

         protected bool AgentTextureCached(SimClient simclient, Packet packet)

         {

-            Console.WriteLine(packet.ToString());

+           // Console.WriteLine(packet.ToString());

             AgentCachedTexturePacket chechedtex = (AgentCachedTexturePacket)packet;

             AgentCachedTextureResponsePacket cachedresp = new AgentCachedTextureResponsePacket();

             cachedresp.AgentData.AgentID = this.AgentID;

diff --git a/OpenSim.RegionServer/world/Entity.cs b/OpenSim.RegionServer/world/Entity.cs
index 424d395..b59d200 100644
--- a/OpenSim.RegionServer/world/Entity.cs
+++ b/OpenSim.RegionServer/world/Entity.cs
@@ -23,11 +23,11 @@ namespace OpenSim.world
             get { return m_name; }

         }

 

-        private LLVector3 m_pos;

+        protected LLVector3 m_pos;

         protected PhysicsActor _physActor;

         protected World m_world;

 

-        public LLVector3 Pos

+        public virtual LLVector3 Pos

         {

             get

             {

diff --git a/OpenSim.RegionServer/world/World.cs b/OpenSim.RegionServer/world/World.cs
index 0799e38..b6f71aa 100644
--- a/OpenSim.RegionServer/world/World.cs
+++ b/OpenSim.RegionServer/world/World.cs
@@ -76,32 +76,16 @@ namespace OpenSim.world
             scriptend = scriptData.LastIndexOf("</Script>");

             substring = scriptData.Substring(scriptstart + 8, scriptend - scriptstart - 8);

             substring = substring.Trim();

-            Console.WriteLine("searching for script to add: " + substring);

-            

+            //Console.WriteLine("searching for script to add: " + substring);

+

             ScriptFactory scriptFactory;

-            

-            if (this.m_scripts.TryGetValue(substring, out scriptFactory ))

+

+            if (this.m_scripts.TryGetValue(substring, out scriptFactory))

             {

-                Console.WriteLine("added script");

-                

-                

-                

+               //Console.WriteLine("added script");

                 this.AddScript(entity, scriptFactory());

             }

-            /*string delimStr = " ";

-            char[] delimiter = delimStr.ToCharArray();

-            string[] line;

-            line = scriptData.Split(delimiter);

-            if (line.Length > 1)

-            {

-                if (line[0] == "script:")

-                {

-                    if (this.m_scripts.ContainsKey(line[1]))

-                    {

-                        this.AddScript(entity, this.m_scripts[line[1]]);

-                    }

-                }

-            }*/

+           

         }

 

         public InventoryCache InventoryCache

@@ -566,8 +550,8 @@ namespace OpenSim.world
         {

             this.m_scripts.Add("FollowRandomAvatar", delegate()

                                                              {

-                                                             return new FollowRandomAvatar();

-                                                         });

+                                                                 return new FollowRandomAvatar();

+                                                             });

         }