diff options
author | Melanie | 2011-01-18 01:28:50 +0000 |
---|---|---|
committer | Melanie | 2011-01-18 01:28:50 +0000 |
commit | 6306578fcf812bfdb27cb00b6c3fc2886e247b87 (patch) | |
tree | 19f379c3507a1714af5d7bb223dda1f6b0a8dddb /OpenSim/Services/Connectors | |
parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
download | opensim-SC_OLD-6306578fcf812bfdb27cb00b6c3fc2886e247b87.zip opensim-SC_OLD-6306578fcf812bfdb27cb00b6c3fc2886e247b87.tar.gz opensim-SC_OLD-6306578fcf812bfdb27cb00b6c3fc2886e247b87.tar.bz2 opensim-SC_OLD-6306578fcf812bfdb27cb00b6c3fc2886e247b87.tar.xz |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Services/Connectors')
7 files changed, 31 insertions, 32 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs index daf94fe..feea196 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs | |||
@@ -58,7 +58,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
58 | MethodBase.GetCurrentMethod().DeclaringType); | 58 | MethodBase.GetCurrentMethod().DeclaringType); |
59 | 59 | ||
60 | private string m_ServerURI = String.Empty; | 60 | private string m_ServerURI = String.Empty; |
61 | private bool m_Enabled = false; | 61 | // private bool m_Enabled = false; |
62 | 62 | ||
63 | public SimianGridServiceConnector() { } | 63 | public SimianGridServiceConnector() { } |
64 | public SimianGridServiceConnector(string serverURI) | 64 | public SimianGridServiceConnector(string serverURI) |
@@ -95,7 +95,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
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; |
98 | m_Enabled = true; | 98 | // m_Enabled = true; |
99 | } | 99 | } |
100 | 100 | ||
101 | #region IGridService | 101 | #region IGridService |
@@ -186,7 +186,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
186 | } | 186 | } |
187 | } | 187 | } |
188 | 188 | ||
189 | m_log.Debug("[SIMIAN GRID CONNECTOR]: Found " + regions.Count + " neighbors for region " + regionID); | 189 | // m_log.Debug("[SIMIAN GRID CONNECTOR]: Found " + regions.Count + " neighbors for region " + regionID); |
190 | return regions; | 190 | return regions; |
191 | } | 191 | } |
192 | 192 | ||
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs index 61f3fbe..39df1f5 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs | |||
@@ -757,7 +757,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
757 | } | 757 | } |
758 | } | 758 | } |
759 | 759 | ||
760 | m_log.Debug("[SIMIAN INVENTORY CONNECTOR]: Parsed " + invFolders.Count + " folders from SimianGrid response"); | 760 | // m_log.Debug("[SIMIAN INVENTORY CONNECTOR]: Parsed " + invFolders.Count + " folders from SimianGrid response"); |
761 | return invFolders; | 761 | return invFolders; |
762 | } | 762 | } |
763 | 763 | ||
@@ -824,7 +824,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
824 | } | 824 | } |
825 | } | 825 | } |
826 | 826 | ||
827 | m_log.Debug("[SIMIAN INVENTORY CONNECTOR]: Parsed " + invItems.Count + " items from SimianGrid response"); | 827 | // m_log.Debug("[SIMIAN INVENTORY CONNECTOR]: Parsed " + invItems.Count + " items from SimianGrid response"); |
828 | return invItems; | 828 | return invItems; |
829 | } | 829 | } |
830 | 830 | ||
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs index 8141420..678f738 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs | |||
@@ -158,7 +158,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
158 | 158 | ||
159 | public bool LogoutAgent(UUID sessionID) | 159 | public bool LogoutAgent(UUID sessionID) |
160 | { | 160 | { |
161 | m_log.InfoFormat("[SIMIAN PRESENCE CONNECTOR]: Logout requested for agent with sessionID " + sessionID); | 161 | // m_log.InfoFormat("[SIMIAN PRESENCE CONNECTOR]: Logout requested for agent with sessionID " + sessionID); |
162 | 162 | ||
163 | NameValueCollection requestArgs = new NameValueCollection | 163 | NameValueCollection requestArgs = new NameValueCollection |
164 | { | 164 | { |
@@ -177,7 +177,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
177 | 177 | ||
178 | public bool LogoutRegionAgents(UUID regionID) | 178 | public bool LogoutRegionAgents(UUID regionID) |
179 | { | 179 | { |
180 | m_log.InfoFormat("[SIMIAN PRESENCE CONNECTOR]: Logout requested for all agents in region " + regionID); | 180 | // m_log.InfoFormat("[SIMIAN PRESENCE CONNECTOR]: Logout requested for all agents in region " + regionID); |
181 | 181 | ||
182 | NameValueCollection requestArgs = new NameValueCollection | 182 | NameValueCollection requestArgs = new NameValueCollection |
183 | { | 183 | { |
@@ -202,7 +202,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
202 | 202 | ||
203 | public PresenceInfo GetAgent(UUID sessionID) | 203 | public PresenceInfo GetAgent(UUID sessionID) |
204 | { | 204 | { |
205 | m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Requesting session data for agent with sessionID " + sessionID); | 205 | // m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Requesting session data for agent with sessionID " + sessionID); |
206 | 206 | ||
207 | NameValueCollection requestArgs = new NameValueCollection | 207 | NameValueCollection requestArgs = new NameValueCollection |
208 | { | 208 | { |
@@ -262,7 +262,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
262 | 262 | ||
263 | public bool LoggedOut(string userID, UUID sessionID, UUID regionID, Vector3 lastPosition, Vector3 lastLookAt) | 263 | public bool LoggedOut(string userID, UUID sessionID, UUID regionID, Vector3 lastPosition, Vector3 lastLookAt) |
264 | { | 264 | { |
265 | m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Logging out user " + userID); | 265 | // m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Logging out user " + userID); |
266 | 266 | ||
267 | // Remove the session to mark this user offline | 267 | // Remove the session to mark this user offline |
268 | if (!LogoutAgent(sessionID)) | 268 | if (!LogoutAgent(sessionID)) |
@@ -287,7 +287,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
287 | 287 | ||
288 | public bool SetHome(string userID, UUID regionID, Vector3 position, Vector3 lookAt) | 288 | public bool SetHome(string userID, UUID regionID, Vector3 position, Vector3 lookAt) |
289 | { | 289 | { |
290 | m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Setting home location for user " + userID); | 290 | // m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Setting home location for user " + userID); |
291 | 291 | ||
292 | NameValueCollection requestArgs = new NameValueCollection | 292 | NameValueCollection requestArgs = new NameValueCollection |
293 | { | 293 | { |
@@ -312,10 +312,10 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
312 | 312 | ||
313 | public GridUserInfo GetGridUserInfo(string user) | 313 | public GridUserInfo GetGridUserInfo(string user) |
314 | { | 314 | { |
315 | m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Requesting session data for agent " + user); | 315 | // m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Requesting session data for agent " + user); |
316 | 316 | ||
317 | UUID userID = new UUID(user); | 317 | UUID userID = new UUID(user); |
318 | m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Requesting user data for " + userID); | 318 | // m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Requesting user data for " + userID); |
319 | 319 | ||
320 | NameValueCollection requestArgs = new NameValueCollection | 320 | NameValueCollection requestArgs = new NameValueCollection |
321 | { | 321 | { |
@@ -338,7 +338,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
338 | 338 | ||
339 | private OSDMap GetUserData(UUID userID) | 339 | private OSDMap GetUserData(UUID userID) |
340 | { | 340 | { |
341 | m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Requesting user data for " + userID); | 341 | // m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Requesting user data for " + userID); |
342 | 342 | ||
343 | NameValueCollection requestArgs = new NameValueCollection | 343 | NameValueCollection requestArgs = new NameValueCollection |
344 | { | 344 | { |
@@ -362,7 +362,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
362 | OSDMap userResponse = GetUserData(userID); | 362 | OSDMap userResponse = GetUserData(userID); |
363 | if (userResponse != null) | 363 | if (userResponse != null) |
364 | { | 364 | { |
365 | m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Requesting sessions for " + userID); | 365 | // m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Requesting sessions for " + userID); |
366 | 366 | ||
367 | NameValueCollection requestArgs = new NameValueCollection | 367 | NameValueCollection requestArgs = new NameValueCollection |
368 | { | 368 | { |
@@ -377,10 +377,10 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
377 | if (presence != null) | 377 | if (presence != null) |
378 | presences.Add(presence); | 378 | presences.Add(presence); |
379 | } | 379 | } |
380 | else | 380 | // else |
381 | { | 381 | // { |
382 | m_log.Debug("[SIMIAN PRESENCE CONNECTOR]: No session returned for " + userID + ": " + response["Message"].AsString()); | 382 | // m_log.Debug("[SIMIAN PRESENCE CONNECTOR]: No session returned for " + userID + ": " + response["Message"].AsString()); |
383 | } | 383 | // } |
384 | } | 384 | } |
385 | 385 | ||
386 | return presences; | 386 | return presences; |
@@ -424,7 +424,6 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
424 | { | 424 | { |
425 | if (userResponse != null && userResponse["User"] is OSDMap) | 425 | if (userResponse != null && userResponse["User"] is OSDMap) |
426 | { | 426 | { |
427 | |||
428 | GridUserInfo info = new GridUserInfo(); | 427 | GridUserInfo info = new GridUserInfo(); |
429 | 428 | ||
430 | info.Online = true; | 429 | info.Online = true; |
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs index 394c2b7..801b424 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs | |||
@@ -157,7 +157,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
157 | { | 157 | { |
158 | List<UserAccount> accounts = new List<UserAccount>(); | 158 | List<UserAccount> accounts = new List<UserAccount>(); |
159 | 159 | ||
160 | m_log.DebugFormat("[SIMIAN ACCOUNT CONNECTOR]: Searching for user accounts with name query " + query); | 160 | // m_log.DebugFormat("[SIMIAN ACCOUNT CONNECTOR]: Searching for user accounts with name query " + query); |
161 | 161 | ||
162 | NameValueCollection requestArgs = new NameValueCollection | 162 | NameValueCollection requestArgs = new NameValueCollection |
163 | { | 163 | { |
@@ -198,7 +198,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
198 | 198 | ||
199 | public bool StoreUserAccount(UserAccount data) | 199 | public bool StoreUserAccount(UserAccount data) |
200 | { | 200 | { |
201 | m_log.InfoFormat("[SIMIAN ACCOUNT CONNECTOR]: Storing user account for " + data.Name); | 201 | // m_log.InfoFormat("[SIMIAN ACCOUNT CONNECTOR]: Storing user account for " + data.Name); |
202 | 202 | ||
203 | NameValueCollection requestArgs = new NameValueCollection | 203 | NameValueCollection requestArgs = new NameValueCollection |
204 | { | 204 | { |
@@ -255,7 +255,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
255 | private UserAccount GetUser(NameValueCollection requestArgs) | 255 | private UserAccount GetUser(NameValueCollection requestArgs) |
256 | { | 256 | { |
257 | string lookupValue = (requestArgs.Count > 1) ? requestArgs[1] : "(Unknown)"; | 257 | string lookupValue = (requestArgs.Count > 1) ? requestArgs[1] : "(Unknown)"; |
258 | m_log.DebugFormat("[SIMIAN ACCOUNT CONNECTOR]: Looking up user account with query: " + lookupValue); | 258 | // m_log.DebugFormat("[SIMIAN ACCOUNT CONNECTOR]: Looking up user account with query: " + lookupValue); |
259 | 259 | ||
260 | OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); | 260 | OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); |
261 | if (response["Success"].AsBoolean()) | 261 | if (response["Success"].AsBoolean()) |
@@ -330,4 +330,4 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
330 | } | 330 | } |
331 | } | 331 | } |
332 | } | 332 | } |
333 | } | 333 | } \ No newline at end of file |
diff --git a/OpenSim/Services/Connectors/Simulation/EstateDataService.cs b/OpenSim/Services/Connectors/Simulation/EstateDataService.cs index 8a8b46d..b6df5a2 100644 --- a/OpenSim/Services/Connectors/Simulation/EstateDataService.cs +++ b/OpenSim/Services/Connectors/Simulation/EstateDataService.cs | |||
@@ -43,9 +43,9 @@ namespace OpenSim.Services.Connectors | |||
43 | { | 43 | { |
44 | public class EstateDataService : ServiceBase, IEstateDataService | 44 | public class EstateDataService : ServiceBase, IEstateDataService |
45 | { | 45 | { |
46 | private static readonly ILog m_log = | 46 | // private static readonly ILog m_log = |
47 | LogManager.GetLogger( | 47 | // LogManager.GetLogger( |
48 | MethodBase.GetCurrentMethod().DeclaringType); | 48 | // MethodBase.GetCurrentMethod().DeclaringType); |
49 | 49 | ||
50 | protected IEstateDataStore m_database; | 50 | protected IEstateDataStore m_database; |
51 | 51 | ||
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationDataService.cs b/OpenSim/Services/Connectors/Simulation/SimulationDataService.cs index 0df9380..ccef50b 100644 --- a/OpenSim/Services/Connectors/Simulation/SimulationDataService.cs +++ b/OpenSim/Services/Connectors/Simulation/SimulationDataService.cs | |||
@@ -43,9 +43,9 @@ namespace OpenSim.Services.Connectors | |||
43 | { | 43 | { |
44 | public class SimulationDataService : ServiceBase, ISimulationDataService | 44 | public class SimulationDataService : ServiceBase, ISimulationDataService |
45 | { | 45 | { |
46 | private static readonly ILog m_log = | 46 | // private static readonly ILog m_log = |
47 | LogManager.GetLogger( | 47 | // LogManager.GetLogger( |
48 | MethodBase.GetCurrentMethod().DeclaringType); | 48 | // MethodBase.GetCurrentMethod().DeclaringType); |
49 | 49 | ||
50 | protected ISimulationDataStore m_database; | 50 | protected ISimulationDataStore m_database; |
51 | 51 | ||
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs index fbfc2dd..039d9e5 100644 --- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs +++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | |||
@@ -237,7 +237,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
237 | 237 | ||
238 | try | 238 | try |
239 | { | 239 | { |
240 | OSDMap result = WebUtil.ServiceOSDRequest(uri,null,"DELETE",10000); | 240 | WebUtil.ServiceOSDRequest(uri, null, "DELETE", 10000); |
241 | } | 241 | } |
242 | catch (Exception e) | 242 | catch (Exception e) |
243 | { | 243 | { |
@@ -255,7 +255,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
255 | 255 | ||
256 | try | 256 | try |
257 | { | 257 | { |
258 | OSDMap result = WebUtil.ServiceOSDRequest(uri,null,"DELETE",10000); | 258 | WebUtil.ServiceOSDRequest(uri, null, "DELETE", 10000); |
259 | } | 259 | } |
260 | catch (Exception e) | 260 | catch (Exception e) |
261 | { | 261 | { |
@@ -311,7 +311,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
311 | args["destination_name"] = OSD.FromString(destination.RegionName); | 311 | args["destination_name"] = OSD.FromString(destination.RegionName); |
312 | args["destination_uuid"] = OSD.FromString(destination.RegionID.ToString()); | 312 | args["destination_uuid"] = OSD.FromString(destination.RegionID.ToString()); |
313 | 313 | ||
314 | OSDMap result = WebUtil.PostToService(uri,args); | 314 | WebUtil.PostToService(uri, args); |
315 | } | 315 | } |
316 | catch (Exception e) | 316 | catch (Exception e) |
317 | { | 317 | { |