aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors/SimianGrid
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Services/Connectors/SimianGrid')
-rw-r--r--OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs32
-rw-r--r--OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs8
-rw-r--r--OpenSim/Services/Connectors/SimianGrid/SimianExternalCapsModule.cs16
-rw-r--r--OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs18
-rw-r--r--OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs16
-rw-r--r--OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs8
-rw-r--r--OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs8
-rw-r--r--OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs10
-rw-r--r--OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs6
-rw-r--r--OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs6
10 files changed, 64 insertions, 64 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
index 531939f..121e863 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
@@ -77,7 +77,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
77 public string Name { get { return "SimianAssetServiceConnector"; } } 77 public string Name { get { return "SimianAssetServiceConnector"; } }
78 public void AddRegion(Scene scene) { if (m_Enabled) { scene.RegisterModuleInterface<IAssetService>(this); } } 78 public void AddRegion(Scene scene) { if (m_Enabled) { scene.RegisterModuleInterface<IAssetService>(this); } }
79 public void RemoveRegion(Scene scene) { if (m_Enabled) { scene.UnregisterModuleInterface<IAssetService>(this); } } 79 public void RemoveRegion(Scene scene) { if (m_Enabled) { scene.UnregisterModuleInterface<IAssetService>(this); } }
80 80
81 #endregion ISharedRegionModule 81 #endregion ISharedRegionModule
82 82
83 public SimianAssetServiceConnector(IConfigSource source) 83 public SimianAssetServiceConnector(IConfigSource source)
@@ -143,7 +143,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
143 143
144 return SimianGetOperation(id); 144 return SimianGetOperation(id);
145 } 145 }
146 146
147 147
148 public AssetBase GetCached(string id) 148 public AssetBase GetCached(string id)
149 { 149 {
@@ -177,7 +177,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
177 // return GetRemoteMetadata(id); 177 // return GetRemoteMetadata(id);
178 return SimianGetMetadataOperation(id); 178 return SimianGetMetadataOperation(id);
179 } 179 }
180 180
181 public byte[] GetData(string id) 181 public byte[] GetData(string id)
182 { 182 {
183 if (String.IsNullOrEmpty(m_serverUrl)) 183 if (String.IsNullOrEmpty(m_serverUrl))
@@ -296,7 +296,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
296 296
297 return SimianStoreOperation(asset); 297 return SimianStoreOperation(asset);
298 } 298 }
299 299
300 /// <summary> 300 /// <summary>
301 /// Update an asset's content 301 /// Update an asset's content
302 /// </summary> 302 /// </summary>
@@ -344,7 +344,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
344 344
345 return SimianDeleteOperation(id); 345 return SimianDeleteOperation(id);
346 } 346 }
347 347
348#endregion IAssetService 348#endregion IAssetService
349 349
350#region SimianOperations 350#region SimianOperations
@@ -369,9 +369,9 @@ namespace OpenSim.Services.Connectors.SimianGrid
369 m_log.WarnFormat("[SIMIAN ASSET CONNECTOR]: failed to delete asset; {0}",response["Message"].AsString()); 369 m_log.WarnFormat("[SIMIAN ASSET CONNECTOR]: failed to delete asset; {0}",response["Message"].AsString());
370 return false; 370 return false;
371 } 371 }
372 372
373 return true; 373 return true;
374 374
375 } 375 }
376 catch (Exception ex) 376 catch (Exception ex)
377 { 377 {
@@ -400,7 +400,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
400 { "Temporary", asset.Temporary ? "1" : "0" }, 400 { "Temporary", asset.Temporary ? "1" : "0" },
401 { "Name", asset.Name } 401 { "Name", asset.Name }
402 }; 402 };
403 403
404 OSDMap response = SimianGrid.PostToService(m_serverUrl,requestArgs); 404 OSDMap response = SimianGrid.PostToService(m_serverUrl,requestArgs);
405 if (! response["Success"].AsBoolean()) 405 if (! response["Success"].AsBoolean())
406 { 406 {
@@ -410,13 +410,13 @@ namespace OpenSim.Services.Connectors.SimianGrid
410 410
411 // asset.ID is always set before calling this function 411 // asset.ID is always set before calling this function
412 return asset.ID; 412 return asset.ID;
413 413
414 } 414 }
415 catch (Exception ex) 415 catch (Exception ex)
416 { 416 {
417 m_log.ErrorFormat("[SIMIAN ASSET CONNECTOR] failed to store asset; {0}",ex.Message); 417 m_log.ErrorFormat("[SIMIAN ASSET CONNECTOR] failed to store asset; {0}",ex.Message);
418 } 418 }
419 419
420 return null; 420 return null;
421 } 421 }
422 422
@@ -427,12 +427,12 @@ namespace OpenSim.Services.Connectors.SimianGrid
427 /// <returns></returns> 427 /// <returns></returns>
428 private AssetBase SimianGetOperation(string id) 428 private AssetBase SimianGetOperation(string id)
429 { 429 {
430 try 430 try
431 { 431 {
432 NameValueCollection requestArgs = new NameValueCollection 432 NameValueCollection requestArgs = new NameValueCollection
433 { 433 {
434 { "RequestMethod", "xGetAsset" }, 434 { "RequestMethod", "xGetAsset" },
435 { "ID", id } 435 { "ID", id }
436 }; 436 };
437 437
438 OSDMap response = SimianGrid.PostToService(m_serverUrl,requestArgs); 438 OSDMap response = SimianGrid.PostToService(m_serverUrl,requestArgs);
@@ -441,7 +441,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
441 m_log.WarnFormat("[SIMIAN ASSET CONNECTOR] Failed to get asset; {0}",response["Message"].AsString()); 441 m_log.WarnFormat("[SIMIAN ASSET CONNECTOR] Failed to get asset; {0}",response["Message"].AsString());
442 return null; 442 return null;
443 } 443 }
444 444
445 AssetBase asset = new AssetBase(); 445 AssetBase asset = new AssetBase();
446 446
447 asset.ID = id; 447 asset.ID = id;
@@ -475,7 +475,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
475 NameValueCollection requestArgs = new NameValueCollection 475 NameValueCollection requestArgs = new NameValueCollection
476 { 476 {
477 { "RequestMethod", "xGetAssetMetadata" }, 477 { "RequestMethod", "xGetAssetMetadata" },
478 { "ID", id } 478 { "ID", id }
479 }; 479 };
480 480
481 OSDMap response = SimianGrid.PostToService(m_serverUrl,requestArgs); 481 OSDMap response = SimianGrid.PostToService(m_serverUrl,requestArgs);
@@ -485,7 +485,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
485 // m_log.DebugFormat("[SIMIAN ASSET CONNECTOR] Failed to get asset metadata; {0}",response["Message"].AsString()); 485 // m_log.DebugFormat("[SIMIAN ASSET CONNECTOR] Failed to get asset metadata; {0}",response["Message"].AsString());
486 return null; 486 return null;
487 } 487 }
488 488
489 AssetMetadata metadata = new AssetMetadata(); 489 AssetMetadata metadata = new AssetMetadata();
490 metadata.ID = id; 490 metadata.ID = id;
491 metadata.ContentType = response["ContentType"].AsString(); 491 metadata.ContentType = response["ContentType"].AsString();
@@ -620,7 +620,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
620 // } 620 // }
621 621
622 // string errorMessage = null; 622 // string errorMessage = null;
623 623
624 // // Build the remote storage request 624 // // Build the remote storage request
625 // List<MultipartForm.Element> postParameters = new List<MultipartForm.Element>() 625 // List<MultipartForm.Element> postParameters = new List<MultipartForm.Element>()
626 // { 626 // {
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs
index a52dd6c..34bb274 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs
@@ -146,7 +146,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
146 userID,response["Message"].AsString()); 146 userID,response["Message"].AsString());
147 return null; 147 return null;
148 } 148 }
149 149
150 // <summary> 150 // <summary>
151 // </summary> 151 // </summary>
152 // <param name=""></param> 152 // <param name=""></param>
@@ -178,7 +178,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
178 178
179 return success; 179 return success;
180 } 180 }
181 181
182 // <summary> 182 // <summary>
183 // </summary> 183 // </summary>
184 // <param name=""></param> 184 // <param name=""></param>
@@ -219,7 +219,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
219 appearance.AvatarHeight = (float)map["Height"].AsReal(); 219 appearance.AvatarHeight = (float)map["Height"].AsReal();
220 220
221 AvatarData avatar = new AvatarData(appearance); 221 AvatarData avatar = new AvatarData(appearance);
222 222
223 // Get attachments 223 // Get attachments
224 map = null; 224 map = null;
225 try { map = OSDParser.DeserializeJson(response["LLAttachments"].AsString()) as OSDMap; } 225 try { map = OSDParser.DeserializeJson(response["LLAttachments"].AsString()) as OSDMap; }
@@ -230,7 +230,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
230 foreach (KeyValuePair<string, OSD> kvp in map) 230 foreach (KeyValuePair<string, OSD> kvp in map)
231 avatar.Data[kvp.Key] = kvp.Value.AsString(); 231 avatar.Data[kvp.Key] = kvp.Value.AsString();
232 } 232 }
233 233
234 return avatar; 234 return avatar;
235 } 235 }
236 else 236 else
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianExternalCapsModule.cs b/OpenSim/Services/Connectors/SimianGrid/SimianExternalCapsModule.cs
index 764e71f..49bd9a4 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianExternalCapsModule.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianExternalCapsModule.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
55 private bool m_enabled = true; 55 private bool m_enabled = true;
56 private Scene m_scene; 56 private Scene m_scene;
57 private String m_simianURL; 57 private String m_simianURL;
58 58
59#region IRegionModule Members 59#region IRegionModule Members
60 60
61 public string Name 61 public string Name
@@ -65,10 +65,10 @@ namespace OpenSim.Services.Connectors.SimianGrid
65 65
66 public void Initialise(IConfigSource config) 66 public void Initialise(IConfigSource config)
67 { 67 {
68 try 68 try
69 { 69 {
70 IConfig m_config; 70 IConfig m_config;
71 71
72 if ((m_config = config.Configs["SimianExternalCaps"]) != null) 72 if ((m_config = config.Configs["SimianExternalCaps"]) != null)
73 { 73 {
74 m_enabled = m_config.GetBoolean("Enabled", m_enabled); 74 m_enabled = m_config.GetBoolean("Enabled", m_enabled);
@@ -97,10 +97,10 @@ namespace OpenSim.Services.Connectors.SimianGrid
97 public void Close() { } 97 public void Close() { }
98 98
99 public void AddRegion(Scene scene) 99 public void AddRegion(Scene scene)
100 { 100 {
101 if (! m_enabled) 101 if (! m_enabled)
102 return; 102 return;
103 103
104 m_scene = scene; 104 m_scene = scene;
105 m_scene.RegisterModuleInterface<IExternalCapsModule>(this); 105 m_scene.RegisterModuleInterface<IExternalCapsModule>(this);
106 } 106 }
@@ -153,7 +153,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
153 subs["%USR%"] = agentID.ToString(); 153 subs["%USR%"] = agentID.ToString();
154 subs["%CAP%"] = cap.ToString(); 154 subs["%CAP%"] = cap.ToString();
155 subs["%SIM%"] = m_scene.RegionInfo.RegionID.ToString(); 155 subs["%SIM%"] = m_scene.RegionInfo.RegionID.ToString();
156 156
157 caps.RegisterHandler(capName,ExpandSkeletonURL(urlSkel,subs)); 157 caps.RegisterHandler(capName,ExpandSkeletonURL(urlSkel,subs));
158 return true; 158 return true;
159 } 159 }
@@ -168,12 +168,12 @@ namespace OpenSim.Services.Connectors.SimianGrid
168 private String ExpandSkeletonURL(String urlSkel, Dictionary<String,String> subs) 168 private String ExpandSkeletonURL(String urlSkel, Dictionary<String,String> subs)
169 { 169 {
170 String result = urlSkel; 170 String result = urlSkel;
171 171
172 foreach (KeyValuePair<String,String> kvp in subs) 172 foreach (KeyValuePair<String,String> kvp in subs)
173 { 173 {
174 result = result.Replace(kvp.Key,kvp.Value); 174 result = result.Replace(kvp.Key,kvp.Value);
175 } 175 }
176 176
177 return result; 177 return result;
178 } 178 }
179 } 179 }
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs b/OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs
index a35d749..b29adb3 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs
@@ -52,20 +52,20 @@ namespace OpenSim.Services.Connectors.SimianGrid
52 private IConfig m_config = null; 52 private IConfig m_config = null;
53 53
54 private String m_simianURL; 54 private String m_simianURL;
55 55
56#region IRegionModule Members 56#region IRegionModule Members
57 57
58 public string Name 58 public string Name
59 { 59 {
60 get { return this.GetType().Name; } 60 get { return this.GetType().Name; }
61 } 61 }
62 62
63 public void Initialise(IConfigSource config) 63 public void Initialise(IConfigSource config)
64 { 64 {
65 try 65 try
66 { 66 {
67 m_config = config.Configs["SimianGrid"]; 67 m_config = config.Configs["SimianGrid"];
68 68
69 if (m_config != null) 69 if (m_config != null)
70 { 70 {
71 m_simianURL = m_config.GetString("SimianServiceURL"); 71 m_simianURL = m_config.GetString("SimianServiceURL");
@@ -74,7 +74,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
74 // m_log.DebugFormat("[SimianGrid] service URL is not defined"); 74 // m_log.DebugFormat("[SimianGrid] service URL is not defined");
75 return; 75 return;
76 } 76 }
77 77
78 InitialiseSimCap(); 78 InitialiseSimCap();
79 SimulatorCapability = SimulatorCapability.Trim(); 79 SimulatorCapability = SimulatorCapability.Trim();
80 m_log.InfoFormat("[SimianExternalCaps] using {0} as simulator capability",SimulatorCapability); 80 m_log.InfoFormat("[SimianExternalCaps] using {0} as simulator capability",SimulatorCapability);
@@ -100,7 +100,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
100 100
101 ///<summary> 101 ///<summary>
102 /// Try a variety of methods for finding the simian simulator capability; first check the 102 /// Try a variety of methods for finding the simian simulator capability; first check the
103 /// configuration itself, then look for a file that contains the cap, then finally look 103 /// configuration itself, then look for a file that contains the cap, then finally look
104 /// for an environment variable that contains it. 104 /// for an environment variable that contains it.
105 ///</summary> 105 ///</summary>
106 private void InitialiseSimCap() 106 private void InitialiseSimCap()
@@ -110,7 +110,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
110 SimulatorCapability = m_config.GetString("SimulatorCapability"); 110 SimulatorCapability = m_config.GetString("SimulatorCapability");
111 return; 111 return;
112 } 112 }
113 113
114 if (m_config.Contains("SimulatorCapabilityFile")) 114 if (m_config.Contains("SimulatorCapabilityFile"))
115 { 115 {
116 String filename = m_config.GetString("SimulatorCapabilityFile"); 116 String filename = m_config.GetString("SimulatorCapabilityFile");
@@ -120,7 +120,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
120 return; 120 return;
121 } 121 }
122 } 122 }
123 123
124 if (m_config.Contains("SimulatorCapabilityVariable")) 124 if (m_config.Contains("SimulatorCapabilityVariable"))
125 { 125 {
126 String envname = m_config.GetString("SimulatorCapabilityVariable"); 126 String envname = m_config.GetString("SimulatorCapabilityVariable");
@@ -134,7 +134,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
134 134
135 m_log.WarnFormat("[SimianExternalCaps] no method specified for simulator capability"); 135 m_log.WarnFormat("[SimianExternalCaps] no method specified for simulator capability");
136 } 136 }
137 137
138#endregion 138#endregion
139 139
140 public static String SimulatorCapability = UUID.Zero.ToString(); 140 public static String SimulatorCapability = UUID.Zero.ToString();
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs b/OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs
index 8375c95..4896d09 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs
@@ -65,14 +65,14 @@ namespace OpenSim.Services.Connectors.SimianGrid
65 private int m_refreshtime = 0; 65 private int m_refreshtime = 0;
66 private int m_lastrefresh = 0; 66 private int m_lastrefresh = 0;
67 private System.Timers.Timer m_refreshTimer = new System.Timers.Timer(); 67 private System.Timers.Timer m_refreshTimer = new System.Timers.Timer();
68 68
69 #region ISharedRegionModule 69 #region ISharedRegionModule
70 70
71 public Type ReplaceableInterface { get { return null; } } 71 public Type ReplaceableInterface { get { return null; } }
72 public string Name { get { return "SimianGridMaptile"; } } 72 public string Name { get { return "SimianGridMaptile"; } }
73 public void RegionLoaded(Scene scene) { } 73 public void RegionLoaded(Scene scene) { }
74 public void Close() { } 74 public void Close() { }
75 75
76 ///<summary> 76 ///<summary>
77 /// 77 ///
78 ///</summary> 78 ///</summary>
@@ -81,7 +81,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
81 IConfig config = source.Configs["SimianGridMaptiles"]; 81 IConfig config = source.Configs["SimianGridMaptiles"];
82 if (config == null) 82 if (config == null)
83 return; 83 return;
84 84
85 if (! config.GetBoolean("Enabled", false)) 85 if (! config.GetBoolean("Enabled", false))
86 return; 86 return;
87 87
@@ -218,7 +218,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
218 { 218 {
219 uint locX = scene.RegionInfo.RegionLocX + (xx / Constants.RegionSize); 219 uint locX = scene.RegionInfo.RegionLocX + (xx / Constants.RegionSize);
220 uint locY = scene.RegionInfo.RegionLocY + (yy / Constants.RegionSize); 220 uint locY = scene.RegionInfo.RegionLocY + (yy / Constants.RegionSize);
221 221
222 ConvertAndUploadMaptile(subMapTile, locX, locY); 222 ConvertAndUploadMaptile(subMapTile, locX, locY);
223 } 223 }
224 } 224 }
@@ -232,7 +232,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
232 } 232 }
233 233
234 } 234 }
235 235
236 ///<summary> 236 ///<summary>
237 /// 237 ///
238 ///</summary> 238 ///</summary>
@@ -255,7 +255,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
255 { "ContentType", "image/png" }, 255 { "ContentType", "image/png" },
256 { "EncodedData", System.Convert.ToBase64String(pngData) } 256 { "EncodedData", System.Convert.ToBase64String(pngData) }
257 }; 257 };
258 258
259 OSDMap response = SimianGrid.PostToService(m_serverUrl,requestArgs); 259 OSDMap response = SimianGrid.PostToService(m_serverUrl,requestArgs);
260 if (! response["Success"].AsBoolean()) 260 if (! response["Success"].AsBoolean())
261 { 261 {
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
index bd35c6f..f8eebbe 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
@@ -91,7 +91,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
91 m_log.Error("[SIMIAN GRID CONNECTOR]: No Server URI named in section GridService"); 91 m_log.Error("[SIMIAN GRID CONNECTOR]: No Server URI named in section GridService");
92 throw new Exception("Grid connector init error"); 92 throw new Exception("Grid connector init error");
93 } 93 }
94 94
95 if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("=")) 95 if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("="))
96 serviceUrl = serviceUrl + '/'; 96 serviceUrl = serviceUrl + '/';
97 m_ServerURI = serviceUrl; 97 m_ServerURI = serviceUrl;
@@ -230,7 +230,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
230 }; 230 };
231 231
232 // m_log.DebugFormat("[SIMIAN GRID CONNECTOR] request grid at {0}",position.ToString()); 232 // m_log.DebugFormat("[SIMIAN GRID CONNECTOR] request grid at {0}",position.ToString());
233 233
234 OSDMap response = SimianGrid.PostToService(m_ServerURI, requestArgs); 234 OSDMap response = SimianGrid.PostToService(m_ServerURI, requestArgs);
235 if (response["Success"].AsBoolean()) 235 if (response["Success"].AsBoolean())
236 { 236 {
@@ -308,7 +308,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
308 }; 308 };
309 309
310 //m_log.DebugFormat("[SIMIAN GRID CONNECTOR] request regions by range {0} to {1}",minPosition.ToString(),maxPosition.ToString()); 310 //m_log.DebugFormat("[SIMIAN GRID CONNECTOR] request regions by range {0} to {1}",minPosition.ToString(),maxPosition.ToString());
311 311
312 312
313 OSDMap response = SimianGrid.PostToService(m_ServerURI, requestArgs); 313 OSDMap response = SimianGrid.PostToService(m_ServerURI, requestArgs);
314 if (response["Success"].AsBoolean()) 314 if (response["Success"].AsBoolean())
@@ -413,7 +413,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
413 return -1; 413 return -1;
414 } 414 }
415 } 415 }
416 416
417 public Dictionary<string, object> GetExtraFeatures() 417 public Dictionary<string, object> GetExtraFeatures()
418 { 418 {
419 /// See SimulatorFeaturesModule - Need to get map, search and destination guide 419 /// See SimulatorFeaturesModule - Need to get map, search and destination guide
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs
index 3d35834..9eefd16 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs
@@ -535,7 +535,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
535 allSuccess = false; 535 allSuccess = false;
536 } 536 }
537 } 537 }
538 538
539 return allSuccess; 539 return allSuccess;
540 } 540 }
541 541
@@ -727,11 +727,11 @@ namespace OpenSim.Services.Connectors.SimianGrid
727 727
728 /// <summary> 728 /// <summary>
729 /// Get the union of permissions of all inventory items 729 /// Get the union of permissions of all inventory items
730 /// that hold the given assetID. 730 /// that hold the given assetID.
731 /// </summary> 731 /// </summary>
732 /// <param name="userID"></param> 732 /// <param name="userID"></param>
733 /// <param name="assetID"></param> 733 /// <param name="assetID"></param>
734 /// <returns>The permissions or 0 if no such asset is found in 734 /// <returns>The permissions or 0 if no such asset is found in
735 /// the user's inventory</returns> 735 /// the user's inventory</returns>
736 public int GetAssetPermissions(UUID userID, UUID assetID) 736 public int GetAssetPermissions(UUID userID, UUID assetID)
737 { 737 {
@@ -787,7 +787,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
787 if (item != null && item["Type"].AsString() == "Item") 787 if (item != null && item["Type"].AsString() == "Item")
788 { 788 {
789 InventoryItemBase invItem = new InventoryItemBase(); 789 InventoryItemBase invItem = new InventoryItemBase();
790 790
791 invItem.AssetID = item["AssetID"].AsUUID(); 791 invItem.AssetID = item["AssetID"].AsUUID();
792 invItem.AssetType = SLUtil.ContentTypeToSLAssetType(item["ContentType"].AsString()); 792 invItem.AssetType = SLUtil.ContentTypeToSLAssetType(item["ContentType"].AsString());
793 invItem.CreationDate = item["CreationDate"].AsInteger(); 793 invItem.CreationDate = item["CreationDate"].AsInteger();
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs
index 211b775..08efefb 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs
@@ -121,7 +121,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
121 if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("=")) 121 if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("="))
122 serviceUrl = serviceUrl + '/'; 122 serviceUrl = serviceUrl + '/';
123 m_serverUrl = serviceUrl; 123 m_serverUrl = serviceUrl;
124 m_activityDetector = new SimianActivityDetector(this); 124 m_activityDetector = new SimianActivityDetector(this);
125 m_Enabled = true; 125 m_Enabled = true;
126 } 126 }
127 } 127 }
@@ -210,7 +210,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
210 m_log.WarnFormat("[SIMIAN PRESENCE CONNECTOR]: Failed to retrieve session {0}: {1}",sessionID.ToString(),sessionResponse["Message"].AsString()); 210 m_log.WarnFormat("[SIMIAN PRESENCE CONNECTOR]: Failed to retrieve session {0}: {1}",sessionID.ToString(),sessionResponse["Message"].AsString());
211 return null; 211 return null;
212 } 212 }
213 213
214 UUID userID = sessionResponse["UserID"].AsUUID(); 214 UUID userID = sessionResponse["UserID"].AsUUID();
215 OSDMap userResponse = GetUserData(userID); 215 OSDMap userResponse = GetUserData(userID);
216 if (userResponse == null) 216 if (userResponse == null)
@@ -238,7 +238,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
238 m_log.WarnFormat("[SIMIAN PRESENCE CONNECTOR]: Failed to retrieve sessions: {0}",sessionListResponse["Message"].AsString()); 238 m_log.WarnFormat("[SIMIAN PRESENCE CONNECTOR]: Failed to retrieve sessions: {0}",sessionListResponse["Message"].AsString());
239 return null; 239 return null;
240 } 240 }
241 241
242 OSDArray sessionList = sessionListResponse["Sessions"] as OSDArray; 242 OSDArray sessionList = sessionListResponse["Sessions"] as OSDArray;
243 for (int i = 0; i < sessionList.Count; i++) 243 for (int i = 0; i < sessionList.Count; i++)
244 { 244 {
@@ -311,7 +311,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
311 311
312 public GridUserInfo GetGridUserInfo(string user) 312 public GridUserInfo GetGridUserInfo(string user)
313 { 313 {
314 // m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Requesting session data for agent " + user); 314 // m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Requesting session data for agent " + user);
315 315
316 UUID userID = new UUID(user); 316 UUID userID = new UUID(user);
317 OSDMap userResponse = GetUserData(userID); 317 OSDMap userResponse = GetUserData(userID);
@@ -421,7 +421,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
421 421
422 return null; 422 return null;
423 } 423 }
424 424
425 private string SerializeLocation(UUID regionID, Vector3 position, Vector3 lookAt) 425 private string SerializeLocation(UUID regionID, Vector3 position, Vector3 lookAt)
426 { 426 {
427 return "{" + String.Format("\"SceneID\":\"{0}\",\"Position\":\"{1}\",\"LookAt\":\"{2}\"", regionID, position, lookAt) + "}"; 427 return "{" + String.Format("\"SceneID\":\"{0}\",\"Position\":\"{1}\",\"LookAt\":\"{2}\"", regionID, position, lookAt) + "}";
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs b/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs
index 17f4fc6..a388bcc 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs
@@ -70,7 +70,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
70 private bool m_Enabled = false; 70 private bool m_Enabled = false;
71 71
72 #region INonSharedRegionModule 72 #region INonSharedRegionModule
73 73
74 public Type ReplaceableInterface { get { return null; } } 74 public Type ReplaceableInterface { get { return null; } }
75 public void RegionLoaded(Scene scene) { } 75 public void RegionLoaded(Scene scene) { }
76 public void Close() { } 76 public void Close() { }
@@ -284,7 +284,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
284 private void RequestAvatarPropertiesHandler(IClientAPI client, UUID avatarID) 284 private void RequestAvatarPropertiesHandler(IClientAPI client, UUID avatarID)
285 { 285 {
286 m_log.DebugFormat("[SIMIAN PROFILES]: Request avatar properties for {0}",avatarID); 286 m_log.DebugFormat("[SIMIAN PROFILES]: Request avatar properties for {0}",avatarID);
287 287
288 OSDMap user = FetchUserData(avatarID); 288 OSDMap user = FetchUserData(avatarID);
289 289
290 ProfileFlags flags = ProfileFlags.AllowPublish | ProfileFlags.MaturePublish; 290 ProfileFlags flags = ProfileFlags.AllowPublish | ProfileFlags.MaturePublish;
@@ -455,7 +455,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
455 private OSDMap FetchUserData(UUID userID) 455 private OSDMap FetchUserData(UUID userID)
456 { 456 {
457 m_log.DebugFormat("[SIMIAN PROFILES]: Fetch information about {0}",userID); 457 m_log.DebugFormat("[SIMIAN PROFILES]: Fetch information about {0}",userID);
458 458
459 NameValueCollection requestArgs = new NameValueCollection 459 NameValueCollection requestArgs = new NameValueCollection
460 { 460 {
461 { "RequestMethod", "GetUser" }, 461 { "RequestMethod", "GetUser" },
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs
index 6f613c1..115ae36 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs
@@ -42,7 +42,7 @@ using OpenMetaverse.StructuredData;
42namespace OpenSim.Services.Connectors.SimianGrid 42namespace OpenSim.Services.Connectors.SimianGrid
43{ 43{
44 /// <summary> 44 /// <summary>
45 /// Connects user account data (creating new users, looking up existing 45 /// Connects user account data (creating new users, looking up existing
46 /// users) to the SimianGrid backend 46 /// users) to the SimianGrid backend
47 /// </summary> 47 /// </summary>
48 [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "SimianUserAccountServiceConnector")] 48 [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "SimianUserAccountServiceConnector")]
@@ -220,7 +220,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
220 }; 220 };
221 221
222 OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs); 222 OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
223 223
224 if (response["Success"].AsBoolean()) 224 if (response["Success"].AsBoolean())
225 { 225 {
226 m_log.InfoFormat("[SIMIAN ACCOUNT CONNECTOR]: Storing user account data for " + data.Name); 226 m_log.InfoFormat("[SIMIAN ACCOUNT CONNECTOR]: Storing user account data for " + data.Name);
@@ -305,7 +305,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
305 account.LocalToGrid = true; 305 account.LocalToGrid = true;
306 if (response.ContainsKey("LocalToGrid")) 306 if (response.ContainsKey("LocalToGrid"))
307 account.LocalToGrid = (response["LocalToGrid"].AsString() == "true" ? true : false); 307 account.LocalToGrid = (response["LocalToGrid"].AsString() == "true" ? true : false);
308 308
309 GetFirstLastName(response["Name"].AsString(), out account.FirstName, out account.LastName); 309 GetFirstLastName(response["Name"].AsString(), out account.FirstName, out account.LastName);
310 310
311 // Cache the user account info 311 // Cache the user account info