aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/Null/NullPresenceData.cs
diff options
context:
space:
mode:
authorJohn Hurliman2010-03-10 14:06:12 -0800
committerJohn Hurliman2010-03-10 14:06:12 -0800
commitb18ca2fee6624d63faf0d44dd2d4b7b64c93fc5a (patch)
treec20d8f5be598d70caff0589629427f6450573cf4 /OpenSim/Data/Null/NullPresenceData.cs
parent* Cleaned up and commented the messy SendInventoryUpdate, fixed a broken debu... (diff)
parentReintroduce a check that was dropped from permissions (diff)
downloadopensim-SC-b18ca2fee6624d63faf0d44dd2d4b7b64c93fc5a.zip
opensim-SC-b18ca2fee6624d63faf0d44dd2d4b7b64c93fc5a.tar.gz
opensim-SC-b18ca2fee6624d63faf0d44dd2d4b7b64c93fc5a.tar.bz2
opensim-SC-b18ca2fee6624d63faf0d44dd2d4b7b64c93fc5a.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Data/Null/NullPresenceData.cs')
-rw-r--r--OpenSim/Data/Null/NullPresenceData.cs16
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Data/Null/NullPresenceData.cs b/OpenSim/Data/Null/NullPresenceData.cs
index 9fc4595..b98b5c9 100644
--- a/OpenSim/Data/Null/NullPresenceData.cs
+++ b/OpenSim/Data/Null/NullPresenceData.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Data.Null
55 } 55 }
56 56
57 public bool Store(PresenceData data) 57 public bool Store(PresenceData data)
58 { 58 {
59 if (Instance != this) 59 if (Instance != this)
60 return Instance.Store(data); 60 return Instance.Store(data);
61 61
@@ -113,7 +113,7 @@ namespace OpenSim.Data.Null
113 } 113 }
114 114
115 public bool SetHomeLocation(string userID, UUID regionID, Vector3 position, Vector3 lookAt) 115 public bool SetHomeLocation(string userID, UUID regionID, Vector3 position, Vector3 lookAt)
116 { 116 {
117 if (Instance != this) 117 if (Instance != this)
118 return Instance.SetHomeLocation(userID, regionID, position, lookAt); 118 return Instance.SetHomeLocation(userID, regionID, position, lookAt);
119 119
@@ -130,28 +130,28 @@ namespace OpenSim.Data.Null
130 p.Data["HomePosition"] = position.ToString(); 130 p.Data["HomePosition"] = position.ToString();
131 p.Data["HomeLookAt"] = lookAt.ToString(); 131 p.Data["HomeLookAt"] = lookAt.ToString();
132 foundone = true; 132 foundone = true;
133 } 133 }
134 } 134 }
135 135
136 return foundone; 136 return foundone;
137 } 137 }
138 138
139 public PresenceData[] Get(string field, string data) 139 public PresenceData[] Get(string field, string data)
140 { 140 {
141 if (Instance != this) 141 if (Instance != this)
142 return Instance.Get(field, data); 142 return Instance.Get(field, data);
143 143
144// m_log.DebugFormat( 144// m_log.DebugFormat(
145// "[NULL PRESENCE DATA]: Getting presence data for field {0} with parameter {1}", field, data); 145// "[NULL PRESENCE DATA]: Getting presence data for field {0} with parameter {1}", field, data);
146 146
147 List<PresenceData> presences = new List<PresenceData>(); 147 List<PresenceData> presences = new List<PresenceData>();
148 if (field == "UserID") 148 if (field == "UserID")
149 { 149 {
150 foreach (PresenceData p in m_presenceData.Values) 150 foreach (PresenceData p in m_presenceData.Values)
151 { 151 {
152 if (p.UserID == data) 152 if (p.UserID == data)
153 { 153 {
154 presences.Add(p); 154 presences.Add(p);
155// Console.WriteLine("HOME for " + p.UserID + " is " + (p.Data.ContainsKey("HomeRegionID") ? p.Data["HomeRegionID"] : "Not found")); 155// Console.WriteLine("HOME for " + p.UserID + " is " + (p.Data.ContainsKey("HomeRegionID") ? p.Data["HomeRegionID"] : "Not found"));
156 } 156 }
157 } 157 }
@@ -194,7 +194,7 @@ namespace OpenSim.Data.Null
194 } 194 }
195 195
196 public void Prune(string userID) 196 public void Prune(string userID)
197 { 197 {
198 if (Instance != this) 198 if (Instance != this)
199 { 199 {
200 Instance.Prune(userID); 200 Instance.Prune(userID);