aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ClientStack/ClientView.API.cs8
-rw-r--r--OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObject.cs22
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs4
5 files changed, 11 insertions, 27 deletions
diff --git a/OpenSim/Region/ClientStack/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs
index 73b3887..81fa58b 100644
--- a/OpenSim/Region/ClientStack/ClientView.API.cs
+++ b/OpenSim/Region/ClientStack/ClientView.API.cs
@@ -73,10 +73,10 @@ namespace OpenSim.Region.ClientStack
73 public event UpdatePrimSingleRotation OnUpdatePrimSingleRotation; 73 public event UpdatePrimSingleRotation OnUpdatePrimSingleRotation;
74 public event UpdatePrimGroupRotation OnUpdatePrimGroupMouseRotation; 74 public event UpdatePrimGroupRotation OnUpdatePrimGroupMouseRotation;
75 public event UpdateVector OnUpdatePrimScale; 75 public event UpdateVector OnUpdatePrimScale;
76 public event StatusChange OnChildAgentStatus; 76 public event StatusChange OnChildAgentStatus; // HOUSEKEEPING : Do we really need this?
77 public event GenericCall2 OnStopMovement; 77 public event GenericCall2 OnStopMovement; // HOUSEKEEPING : Do we really need this?
78 public event NewAvatar OnNewAvatar; 78 public event NewAvatar OnNewAvatar; // HOUSEKEEPING : Do we really need this?
79 public event GenericCall6 OnRemoveAvatar; 79 public event GenericCall6 OnRemoveAvatar; // HOUSEKEEPING : Do we really need this?
80 public event RequestMapBlocks OnRequestMapBlocks; 80 public event RequestMapBlocks OnRequestMapBlocks;
81 public event TeleportLocationRequest OnTeleportLocationRequest; 81 public event TeleportLocationRequest OnTeleportLocationRequest;
82 82
diff --git a/OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart.cs
index b91e04a..4b05e31 100644
--- a/OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart.cs
@@ -25,7 +25,7 @@ namespace OpenSim.Region.Environment.Scenes
25 private const uint FULL_MASK_PERMISSIONS = 2147483647; 25 private const uint FULL_MASK_PERMISSIONS = 2147483647;
26 26
27 private ulong m_regionHandle; 27 private ulong m_regionHandle;
28 private uint m_flags = 32 + 65536 + 131072 + 256 + 4 + 8 + 2048 + 524288 + 268435456 + 128; 28 private uint m_flags = 32 + 65536 + 131072 + 256 + 4 + 8 + 2048 + 524288 + 268435456 + 128; // HOUSEKEEPING : Do we really need this?
29 //private Dictionary<LLUUID, InventoryItem> inventoryItems; 29 //private Dictionary<LLUUID, InventoryItem> inventoryItems;
30 30
31 public string SitName = ""; 31 public string SitName = "";
diff --git a/OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs b/OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs
index b0df4af..4792d15 100644
--- a/OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs
+++ b/OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs
@@ -15,7 +15,7 @@ namespace OpenSim.Region.Environment.Scenes
15 private const uint FULL_MASK_PERMISSIONS = 2147483647; 15 private const uint FULL_MASK_PERMISSIONS = 2147483647;
16 16
17 private ulong m_regionHandle; 17 private ulong m_regionHandle;
18 private uint m_flags = 32 + 65536 + 131072 + 256 + 4 + 8 + 2048 + 524288 + 268435456 + 128; 18 private uint m_flags = 32 + 65536 + 131072 + 256 + 4 + 8 + 2048 + 524288 + 268435456 + 128; // HOUSEKEEPING : Do we really need this?
19 //private Dictionary<LLUUID, InventoryItem> inventoryItems; 19 //private Dictionary<LLUUID, InventoryItem> inventoryItems;
20 20
21 public string SitName = ""; 21 public string SitName = "";
diff --git a/OpenSim/Region/Environment/Scenes/SceneObject.cs b/OpenSim/Region/Environment/Scenes/SceneObject.cs
index 9e8135f..294087f 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObject.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObject.cs
@@ -43,30 +43,14 @@ namespace OpenSim.Region.Environment.Scenes
43 private new Scene m_world; 43 private new Scene m_world;
44 protected ulong m_regionHandle; 44 protected ulong m_regionHandle;
45 45
46 private bool physicsEnabled = false; 46 private bool physicsEnabled = false; // HOUSEKEEPING : Do we really need this?
47 private PhysicsScene m_PhysScene; 47 private PhysicsScene m_PhysScene; // HOUSEKEEPING : Do we really need this?
48 private PhysicsActor m_PhysActor; 48 private PhysicsActor m_PhysActor; // HOUSEKEEPING : Do we really need this?
49 49
50 private EventManager m_eventManager; 50 private EventManager m_eventManager;
51 51
52 public bool isSelected = false; 52 public bool isSelected = false;
53 53
54 public PhysicsScene PhysScene
55 {
56 get
57 {
58 return m_PhysScene;
59 }
60 }
61
62 public PhysicsActor PhysActor
63 {
64 get
65 {
66 return m_PhysActor;
67 }
68 }
69
70 public LLUUID rootUUID 54 public LLUUID rootUUID
71 { 55 {
72 get 56 get
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 31c311c..3bfc70f 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -48,7 +48,7 @@ namespace OpenSim.Region.Environment.Scenes
48 public IClientAPI ControllingClient; 48 public IClientAPI ControllingClient;
49 public LLUUID current_anim; 49 public LLUUID current_anim;
50 public int anim_seq; 50 public int anim_seq;
51 private bool updateflag = false; 51 private bool updateflag = false; // HOUSEKEEPING : Do we really need this?
52 private byte movementflag = 0; 52 private byte movementflag = 0;
53 private List<NewForce> forcesList = new List<NewForce>(); 53 private List<NewForce> forcesList = new List<NewForce>();
54 private short _updateCount = 0; 54 private short _updateCount = 0;
@@ -63,7 +63,7 @@ namespace OpenSim.Region.Environment.Scenes
63 63
64 private bool newForce = false; 64 private bool newForce = false;
65 private bool newAvatar = false; 65 private bool newAvatar = false;
66 private IScenePresenceBody m_body; 66 private IScenePresenceBody m_body; // HOUSEKEEPING : Do we really need this?
67 67
68 protected RegionInfo m_regionInfo; 68 protected RegionInfo m_regionInfo;
69 69