aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server
diff options
context:
space:
mode:
authorDiva Canto2010-02-26 10:35:23 -0800
committerDiva Canto2010-02-26 10:35:23 -0800
commitbbb43f9bdeda4994653c72fac62f9023d6dbdcdc (patch)
tree2a9458010ac18ca5e89b53364c619d4433d910fc /OpenSim/Server
parentFlags on Store(Friend) are supposed to be MyFlags. (diff)
downloadopensim-SC_OLD-bbb43f9bdeda4994653c72fac62f9023d6dbdcdc.zip
opensim-SC_OLD-bbb43f9bdeda4994653c72fac62f9023d6dbdcdc.tar.gz
opensim-SC_OLD-bbb43f9bdeda4994653c72fac62f9023d6dbdcdc.tar.bz2
opensim-SC_OLD-bbb43f9bdeda4994653c72fac62f9023d6dbdcdc.tar.xz
Now showing friends online upon grid login.
Diffstat (limited to 'OpenSim/Server')
-rw-r--r--OpenSim/Server/Base/ServerUtils.cs9
-rw-r--r--OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs3
2 files changed, 8 insertions, 4 deletions
diff --git a/OpenSim/Server/Base/ServerUtils.cs b/OpenSim/Server/Base/ServerUtils.cs
index 2fbcea4..9c54410 100644
--- a/OpenSim/Server/Base/ServerUtils.cs
+++ b/OpenSim/Server/Base/ServerUtils.cs
@@ -140,12 +140,13 @@ namespace OpenSim.Server.Base
140 140
141 if (name.EndsWith("[]")) 141 if (name.EndsWith("[]"))
142 { 142 {
143 if (result.ContainsKey(name)) 143 string cleanName = name.Substring(0, name.Length - 2);
144 if (result.ContainsKey(cleanName))
144 { 145 {
145 if (!(result[name] is List<string>)) 146 if (!(result[cleanName] is List<string>))
146 continue; 147 continue;
147 148
148 List<string> l = (List<string>)result[name]; 149 List<string> l = (List<string>)result[cleanName];
149 150
150 l.Add(value); 151 l.Add(value);
151 } 152 }
@@ -155,7 +156,7 @@ namespace OpenSim.Server.Base
155 156
156 newList.Add(value); 157 newList.Add(value);
157 158
158 result[name] = newList; 159 result[cleanName] = newList;
159 } 160 }
160 } 161 }
161 else 162 else
diff --git a/OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs b/OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs
index d180bbb..4ebf933 100644
--- a/OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs
@@ -227,7 +227,10 @@ namespace OpenSim.Server.Handlers.Presence
227 string[] userIDs; 227 string[] userIDs;
228 228
229 if (!request.ContainsKey("uuids")) 229 if (!request.ContainsKey("uuids"))
230 {
231 m_log.DebugFormat("[PRESENCE HANDLER]: GetAgents called without required uuids argument");
230 return FailureResult(); 232 return FailureResult();
233 }
231 234
232 if (!(request["uuids"] is List<string>)) 235 if (!(request["uuids"] is List<string>))
233 { 236 {