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.

2 files changed, 10 insertions, 26 deletions

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();

+                                                             });

         }