aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorAdam Frisby2007-07-27 06:20:32 +0000
committerAdam Frisby2007-07-27 06:20:32 +0000
commitbc11fa8fda8edff65599ee03e350a49b6b09d31f (patch)
tree3abaa35246d84c42bf9dc56061ad4e37f57e2989
parentMore work on inventory and opensim library. (diff)
downloadopensim-SC-bc11fa8fda8edff65599ee03e350a49b6b09d31f.zip
opensim-SC-bc11fa8fda8edff65599ee03e350a49b6b09d31f.tar.gz
opensim-SC-bc11fa8fda8edff65599ee03e350a49b6b09d31f.tar.bz2
opensim-SC-bc11fa8fda8edff65599ee03e350a49b6b09d31f.tar.xz
* Removing some housekeeping tagged elements.
* 6 Compiler warnings left (total) - two legacy caps warnings, four unused ScenePresence events.
-rw-r--r--OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs16
2 files changed, 13 insertions, 5 deletions
diff --git a/OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs b/OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs
index 4792d15..fd494fa 100644
--- a/OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs
+++ b/OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs
@@ -15,8 +15,6 @@ 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; // HOUSEKEEPING : Do we really need this?
19 //private Dictionary<LLUUID, InventoryItem> inventoryItems;
20 18
21 public string SitName = ""; 19 public string SitName = "";
22 public string TouchName = ""; 20 public string TouchName = "";
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index b3255c4..fa2b36a 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -48,12 +48,11 @@ 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; // HOUSEKEEPING : Do we really need this? 51 private bool updateflag = false;
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;
55 private Quaternion bodyRot; 55 private Quaternion bodyRot;
56 // private LLObject.TextureEntry avatarAppearanceTexture = null;
57 private byte[] visualParams; 56 private byte[] visualParams;
58 private AvatarWearable[] Wearables; 57 private AvatarWearable[] Wearables;
59 private ulong m_regionHandle; 58 private ulong m_regionHandle;
@@ -63,7 +62,6 @@ namespace OpenSim.Region.Environment.Scenes
63 62
64 private bool newForce = false; 63 private bool newForce = false;
65 private bool newAvatar = false; 64 private bool newAvatar = false;
66 private IScenePresenceBody m_body; // HOUSEKEEPING : Do we really need this?
67 65
68 protected RegionInfo m_regionInfo; 66 protected RegionInfo m_regionInfo;
69 protected ulong crossingFromRegion = 0; 67 protected ulong crossingFromRegion = 0;
@@ -102,6 +100,18 @@ namespace OpenSim.Region.Environment.Scenes
102 } 100 }
103 } 101 }
104 102
103 public bool Updated
104 {
105 set
106 {
107 this.updateflag = value;
108 }
109 get
110 {
111 return this.updateflag;
112 }
113 }
114
105 public ulong RegionHandle 115 public ulong RegionHandle
106 { 116 {
107 get { return m_regionHandle; } 117 get { return m_regionHandle; }