* Removed ClientThreads from avatar

* Deleted SimpleApp2 as it's getting wonkier and wonkier by the minute
* Added avatar handling to SimpleApp, still don't have any avatar out on the playing field
* Removed some warnings
* Went from IWorld to Scene
* 

1 files changed, 8 insertions, 2 deletions

diff --git a/OpenSim/OpenSim.Region/Scenes/Entity.cs b/OpenSim/OpenSim.Region/Scenes/Entity.cs
index 007bdaf..2376fc4 100644
--- a/OpenSim/OpenSim.Region/Scenes/Entity.cs
+++ b/OpenSim/OpenSim.Region/Scenes/Entity.cs
@@ -38,7 +38,6 @@ namespace OpenSim.Region.Scenes
     public abstract class Entity : IScriptReadonlyEntity

     {

         public libsecondlife.LLUUID uuid;

-        public uint localid;

         public LLVector3 velocity;

         public Quaternion rotation;

         protected List<Entity> children;

@@ -128,13 +127,20 @@ namespace OpenSim.Region.Scenes
             }

         }

 

+        protected uint m_localId;

+

+        public uint LocalId

+        {

+            get { return m_localId; }

+        }

+

         /// <summary>

         /// Creates a new Entity (should not occur on it's own)

         /// </summary>

         public Entity()

         {

             uuid = new libsecondlife.LLUUID();

-            localid = 0;

+

             m_pos = new LLVector3();

             velocity = new LLVector3();

             rotation = new Quaternion();