aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors/GridUser
diff options
context:
space:
mode:
authorBlueWall2012-10-09 06:44:14 -0400
committerBlueWall2012-10-09 06:44:14 -0400
commit252af020b05f386f88174cdd28191e0efbeba626 (patch)
treef425499b4338fa3a15f51b7621f4d37dec1d5ce7 /OpenSim/Services/Connectors/GridUser
parentAdded parts to manage repositories and plugin management (diff)
parentFix build break (diff)
downloadopensim-SC_OLD-252af020b05f386f88174cdd28191e0efbeba626.zip
opensim-SC_OLD-252af020b05f386f88174cdd28191e0efbeba626.tar.gz
opensim-SC_OLD-252af020b05f386f88174cdd28191e0efbeba626.tar.bz2
opensim-SC_OLD-252af020b05f386f88174cdd28191e0efbeba626.tar.xz
Merge branch 'master' into connector_plugin
Conflicts: OpenSim/Server/ServerMain.cs
Diffstat (limited to '')
-rw-r--r--OpenSim/Services/Connectors/GridUser/GridUserServicesConnector.cs9
1 files changed, 7 insertions, 2 deletions
diff --git a/OpenSim/Services/Connectors/GridUser/GridUserServicesConnector.cs b/OpenSim/Services/Connectors/GridUser/GridUserServicesConnector.cs
index 20d7eaf..94bda82 100644
--- a/OpenSim/Services/Connectors/GridUser/GridUserServicesConnector.cs
+++ b/OpenSim/Services/Connectors/GridUser/GridUserServicesConnector.cs
@@ -207,7 +207,7 @@ namespace OpenSim.Services.Connectors
207 if ((replyData != null) && replyData.ContainsKey("result") && (replyData["result"] != null)) 207 if ((replyData != null) && replyData.ContainsKey("result") && (replyData["result"] != null))
208 { 208 {
209 if (replyData["result"] is Dictionary<string, object>) 209 if (replyData["result"] is Dictionary<string, object>)
210 guinfo = new GridUserInfo((Dictionary<string, object>)replyData["result"]); 210 guinfo = Create((Dictionary<string, object>)replyData["result"]);
211 } 211 }
212 212
213 return guinfo; 213 return guinfo;
@@ -273,7 +273,7 @@ namespace OpenSim.Services.Connectors
273 { 273 {
274 if (griduser is Dictionary<string, object>) 274 if (griduser is Dictionary<string, object>)
275 { 275 {
276 GridUserInfo pinfo = new GridUserInfo((Dictionary<string, object>)griduser); 276 GridUserInfo pinfo = Create((Dictionary<string, object>)griduser);
277 rinfos.Add(pinfo); 277 rinfos.Add(pinfo);
278 } 278 }
279 else 279 else
@@ -286,5 +286,10 @@ namespace OpenSim.Services.Connectors
286 286
287 return rinfos.ToArray(); 287 return rinfos.ToArray();
288 } 288 }
289
290 protected virtual GridUserInfo Create(Dictionary<string, object> griduser)
291 {
292 return new GridUserInfo(griduser);
293 }
289 } 294 }
290} 295}