diff options
Diffstat (limited to '')
25 files changed, 134 insertions, 134 deletions
diff --git a/OpenSim/Services/Connectors/AgentPreferences/AgentPreferencesConnector.cs b/OpenSim/Services/Connectors/AgentPreferences/AgentPreferencesConnector.cs index 0e72c8b..bd342fa 100644 --- a/OpenSim/Services/Connectors/AgentPreferences/AgentPreferencesConnector.cs +++ b/OpenSim/Services/Connectors/AgentPreferences/AgentPreferencesConnector.cs | |||
@@ -110,7 +110,7 @@ namespace OpenSim.Services.Connectors | |||
110 | { | 110 | { |
111 | m_log.DebugFormat("[AGENT PREFERENCES CONNECTOR]: Exception when contacting agent preferences server at {0}: {1}", uri, e.Message); | 111 | m_log.DebugFormat("[AGENT PREFERENCES CONNECTOR]: Exception when contacting agent preferences server at {0}: {1}", uri, e.Message); |
112 | } | 112 | } |
113 | 113 | ||
114 | Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply); | 114 | Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply); |
115 | if (replyData != null) | 115 | if (replyData != null) |
116 | { | 116 | { |
diff --git a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs index bdc3bef..3fa8b54 100644 --- a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs +++ b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs | |||
@@ -55,7 +55,7 @@ namespace OpenSim.Services.Connectors | |||
55 | private List<AssetBase>[] m_sendRetries = new List<AssetBase>[MAXSENDRETRIESLEN]; | 55 | private List<AssetBase>[] m_sendRetries = new List<AssetBase>[MAXSENDRETRIESLEN]; |
56 | private System.Timers.Timer m_retryTimer; | 56 | private System.Timers.Timer m_retryTimer; |
57 | private int m_maxAssetRequestConcurrency = 30; | 57 | private int m_maxAssetRequestConcurrency = 30; |
58 | 58 | ||
59 | private delegate void AssetRetrievedEx(AssetBase asset); | 59 | private delegate void AssetRetrievedEx(AssetBase asset); |
60 | 60 | ||
61 | // Keeps track of concurrent requests for the same asset, so that it's only loaded once. | 61 | // Keeps track of concurrent requests for the same asset, so that it's only loaded once. |
@@ -150,7 +150,7 @@ namespace OpenSim.Services.Connectors | |||
150 | string prefix = id.Substring(0, 2).ToLower(); | 150 | string prefix = id.Substring(0, 2).ToLower(); |
151 | 151 | ||
152 | string host; | 152 | string host; |
153 | 153 | ||
154 | // HG URLs will not be valid UUIDS | 154 | // HG URLs will not be valid UUIDS |
155 | if (m_UriMap.ContainsKey(prefix)) | 155 | if (m_UriMap.ContainsKey(prefix)) |
156 | host = m_UriMap[prefix]; | 156 | host = m_UriMap[prefix]; |
@@ -180,11 +180,11 @@ namespace OpenSim.Services.Connectors | |||
180 | if(m_retryCounter >= 61 ) // avoid overflow 60 is max in use below | 180 | if(m_retryCounter >= 61 ) // avoid overflow 60 is max in use below |
181 | m_retryCounter = 1; | 181 | m_retryCounter = 1; |
182 | 182 | ||
183 | int inUse = 0; | 183 | int inUse = 0; |
184 | int nextlevel; | 184 | int nextlevel; |
185 | int timefactor; | 185 | int timefactor; |
186 | List<AssetBase> retrylist; | 186 | List<AssetBase> retrylist; |
187 | // we need to go down | 187 | // we need to go down |
188 | for(int i = MAXSENDRETRIESLEN - 1; i >= 0; i--) | 188 | for(int i = MAXSENDRETRIESLEN - 1; i >= 0; i--) |
189 | { | 189 | { |
190 | lock(m_sendRetries) | 190 | lock(m_sendRetries) |
@@ -219,13 +219,13 @@ namespace OpenSim.Services.Connectors | |||
219 | lock(m_sendRetries) | 219 | lock(m_sendRetries) |
220 | m_sendRetries[i] = null; | 220 | m_sendRetries[i] = null; |
221 | 221 | ||
222 | // we are the only ones with a copy of this retrylist now | 222 | // we are the only ones with a copy of this retrylist now |
223 | foreach(AssetBase ass in retrylist) | 223 | foreach(AssetBase ass in retrylist) |
224 | retryStore(ass, nextlevel); | 224 | retryStore(ass, nextlevel); |
225 | } | 225 | } |
226 | 226 | ||
227 | lock(m_sendRetries) | 227 | lock(m_sendRetries) |
228 | { | 228 | { |
229 | if(inUse == 0 ) | 229 | if(inUse == 0 ) |
230 | m_retryTimer.Stop(); | 230 | m_retryTimer.Stop(); |
231 | 231 | ||
@@ -245,7 +245,7 @@ namespace OpenSim.Services.Connectors | |||
245 | AssetBase asset = null; | 245 | AssetBase asset = null; |
246 | if (m_Cache != null) | 246 | if (m_Cache != null) |
247 | asset = m_Cache.Get(id); | 247 | asset = m_Cache.Get(id); |
248 | 248 | ||
249 | if (asset == null || asset.Data == null || asset.Data.Length == 0) | 249 | if (asset == null || asset.Data == null || asset.Data.Length == 0) |
250 | { | 250 | { |
251 | // XXX: Commented out for now since this has either never been properly operational or not for some time | 251 | // XXX: Commented out for now since this has either never been properly operational or not for some time |
@@ -259,7 +259,7 @@ namespace OpenSim.Services.Connectors | |||
259 | 259 | ||
260 | asset = SynchronousRestObjectRequester.MakeRequest<int, AssetBase>("GET", uri, 0, m_Auth); | 260 | asset = SynchronousRestObjectRequester.MakeRequest<int, AssetBase>("GET", uri, 0, m_Auth); |
261 | 261 | ||
262 | 262 | ||
263 | if (m_Cache != null) | 263 | if (m_Cache != null) |
264 | { | 264 | { |
265 | if (asset != null) | 265 | if (asset != null) |
@@ -438,7 +438,7 @@ namespace OpenSim.Services.Connectors | |||
438 | // This is most likely to happen because the server doesn't support this function, | 438 | // This is most likely to happen because the server doesn't support this function, |
439 | // so just silently return "doesn't exist" for all the assets. | 439 | // so just silently return "doesn't exist" for all the assets. |
440 | } | 440 | } |
441 | 441 | ||
442 | if (exist == null) | 442 | if (exist == null) |
443 | exist = new bool[ids.Length]; | 443 | exist = new bool[ids.Length]; |
444 | 444 | ||
@@ -557,7 +557,7 @@ namespace OpenSim.Services.Connectors | |||
557 | if(nextRetryLevel >= MAXSENDRETRIESLEN) | 557 | if(nextRetryLevel >= MAXSENDRETRIESLEN) |
558 | m_log.WarnFormat("[Assets] Upload giveup after several retries id: {0} type {1}", | 558 | m_log.WarnFormat("[Assets] Upload giveup after several retries id: {0} type {1}", |
559 | asset.ID.ToString(), asset.Type.ToString()); | 559 | asset.ID.ToString(), asset.Type.ToString()); |
560 | else | 560 | else |
561 | { | 561 | { |
562 | lock(m_sendRetries) | 562 | lock(m_sendRetries) |
563 | { | 563 | { |
diff --git a/OpenSim/Services/Connectors/Authorization/AuthorizationServicesConnector.cs b/OpenSim/Services/Connectors/Authorization/AuthorizationServicesConnector.cs index d2da85f..a130f71 100644 --- a/OpenSim/Services/Connectors/Authorization/AuthorizationServicesConnector.cs +++ b/OpenSim/Services/Connectors/Authorization/AuthorizationServicesConnector.cs | |||
@@ -37,7 +37,7 @@ using OpenMetaverse; | |||
37 | 37 | ||
38 | namespace OpenSim.Services.Connectors | 38 | namespace OpenSim.Services.Connectors |
39 | { | 39 | { |
40 | public class AuthorizationServicesConnector | 40 | public class AuthorizationServicesConnector |
41 | { | 41 | { |
42 | private static readonly ILog m_log = | 42 | private static readonly ILog m_log = |
43 | LogManager.GetLogger( | 43 | LogManager.GetLogger( |
@@ -45,7 +45,7 @@ namespace OpenSim.Services.Connectors | |||
45 | 45 | ||
46 | private string m_ServerURI = String.Empty; | 46 | private string m_ServerURI = String.Empty; |
47 | private bool m_ResponseOnFailure = true; | 47 | private bool m_ResponseOnFailure = true; |
48 | 48 | ||
49 | public AuthorizationServicesConnector() | 49 | public AuthorizationServicesConnector() |
50 | { | 50 | { |
51 | } | 51 | } |
@@ -78,11 +78,11 @@ namespace OpenSim.Services.Connectors | |||
78 | throw new Exception("Authorization connector init error"); | 78 | throw new Exception("Authorization connector init error"); |
79 | } | 79 | } |
80 | m_ServerURI = serviceURI; | 80 | m_ServerURI = serviceURI; |
81 | 81 | ||
82 | // this dictates what happens if the remote service fails, if the service fails and the value is true | 82 | // this dictates what happens if the remote service fails, if the service fails and the value is true |
83 | // the user is authorized for the region. | 83 | // the user is authorized for the region. |
84 | bool responseOnFailure = authorizationConfig.GetBoolean("ResponseOnFailure",true); | 84 | bool responseOnFailure = authorizationConfig.GetBoolean("ResponseOnFailure",true); |
85 | 85 | ||
86 | m_ResponseOnFailure = responseOnFailure; | 86 | m_ResponseOnFailure = responseOnFailure; |
87 | m_log.Info("[AUTHORIZATION CONNECTOR]: AuthorizationService initialized"); | 87 | m_log.Info("[AUTHORIZATION CONNECTOR]: AuthorizationService initialized"); |
88 | } | 88 | } |
@@ -91,11 +91,11 @@ namespace OpenSim.Services.Connectors | |||
91 | { | 91 | { |
92 | // do a remote call to the authorization server specified in the AuthorizationServerURI | 92 | // do a remote call to the authorization server specified in the AuthorizationServerURI |
93 | m_log.InfoFormat("[AUTHORIZATION CONNECTOR]: IsAuthorizedForRegion checking {0} at remote server {1}", userID, m_ServerURI); | 93 | m_log.InfoFormat("[AUTHORIZATION CONNECTOR]: IsAuthorizedForRegion checking {0} at remote server {1}", userID, m_ServerURI); |
94 | 94 | ||
95 | string uri = m_ServerURI; | 95 | string uri = m_ServerURI; |
96 | 96 | ||
97 | AuthorizationRequest req = new AuthorizationRequest(userID, firstname, surname, email, regionName, regionID); | 97 | AuthorizationRequest req = new AuthorizationRequest(userID, firstname, surname, email, regionName, regionID); |
98 | 98 | ||
99 | AuthorizationResponse response; | 99 | AuthorizationResponse response; |
100 | try | 100 | try |
101 | { | 101 | { |
@@ -114,7 +114,7 @@ namespace OpenSim.Services.Connectors | |||
114 | } | 114 | } |
115 | m_log.DebugFormat("[AUTHORIZATION CONNECTOR] response from remote service was {0}", response.Message); | 115 | m_log.DebugFormat("[AUTHORIZATION CONNECTOR] response from remote service was {0}", response.Message); |
116 | message = response.Message; | 116 | message = response.Message; |
117 | 117 | ||
118 | return response.IsAuthorized; | 118 | return response.IsAuthorized; |
119 | } | 119 | } |
120 | 120 | ||
diff --git a/OpenSim/Services/Connectors/Avatar/AvatarServicesConnector.cs b/OpenSim/Services/Connectors/Avatar/AvatarServicesConnector.cs index 3f44efa..424e95a 100644 --- a/OpenSim/Services/Connectors/Avatar/AvatarServicesConnector.cs +++ b/OpenSim/Services/Connectors/Avatar/AvatarServicesConnector.cs | |||
@@ -94,13 +94,13 @@ namespace OpenSim.Services.Connectors | |||
94 | AvatarData avatar = GetAvatar(userID); | 94 | AvatarData avatar = GetAvatar(userID); |
95 | return avatar.ToAvatarAppearance(); | 95 | return avatar.ToAvatarAppearance(); |
96 | } | 96 | } |
97 | 97 | ||
98 | public bool SetAppearance(UUID userID, AvatarAppearance appearance) | 98 | public bool SetAppearance(UUID userID, AvatarAppearance appearance) |
99 | { | 99 | { |
100 | AvatarData avatar = new AvatarData(appearance); | 100 | AvatarData avatar = new AvatarData(appearance); |
101 | return SetAvatar(userID,avatar); | 101 | return SetAvatar(userID,avatar); |
102 | } | 102 | } |
103 | 103 | ||
104 | public AvatarData GetAvatar(UUID userID) | 104 | public AvatarData GetAvatar(UUID userID) |
105 | { | 105 | { |
106 | Dictionary<string, object> sendData = new Dictionary<string, object>(); | 106 | Dictionary<string, object> sendData = new Dictionary<string, object>(); |
diff --git a/OpenSim/Services/Connectors/Friends/FriendsServicesConnector.cs b/OpenSim/Services/Connectors/Friends/FriendsServicesConnector.cs index b7702a8..873b554 100644 --- a/OpenSim/Services/Connectors/Friends/FriendsServicesConnector.cs +++ b/OpenSim/Services/Connectors/Friends/FriendsServicesConnector.cs | |||
@@ -86,7 +86,7 @@ namespace OpenSim.Services.Connectors.Friends | |||
86 | 86 | ||
87 | 87 | ||
88 | #region IFriendsService | 88 | #region IFriendsService |
89 | 89 | ||
90 | public FriendInfo[] GetFriends(UUID PrincipalID) | 90 | public FriendInfo[] GetFriends(UUID PrincipalID) |
91 | { | 91 | { |
92 | Dictionary<string, object> sendData = new Dictionary<string, object>(); | 92 | Dictionary<string, object> sendData = new Dictionary<string, object>(); |
diff --git a/OpenSim/Services/Connectors/Grid/GridServicesConnector.cs b/OpenSim/Services/Connectors/Grid/GridServicesConnector.cs index ceb2146..ded7806 100644 --- a/OpenSim/Services/Connectors/Grid/GridServicesConnector.cs +++ b/OpenSim/Services/Connectors/Grid/GridServicesConnector.cs | |||
@@ -683,7 +683,7 @@ namespace OpenSim.Services.Connectors | |||
683 | 683 | ||
684 | return rinfos; | 684 | return rinfos; |
685 | } | 685 | } |
686 | 686 | ||
687 | public int GetRegionFlags(UUID scopeID, UUID regionID) | 687 | public int GetRegionFlags(UUID scopeID, UUID regionID) |
688 | { | 688 | { |
689 | Dictionary<string, object> sendData = new Dictionary<string, object>(); | 689 | Dictionary<string, object> sendData = new Dictionary<string, object>(); |
@@ -755,7 +755,7 @@ namespace OpenSim.Services.Connectors | |||
755 | if (reply != string.Empty) | 755 | if (reply != string.Empty) |
756 | { | 756 | { |
757 | Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply); | 757 | Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply); |
758 | 758 | ||
759 | if ((replyData != null) && replyData.Count > 0) | 759 | if ((replyData != null) && replyData.Count > 0) |
760 | { | 760 | { |
761 | foreach (string key in replyData.Keys) | 761 | foreach (string key in replyData.Keys) |
diff --git a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs index eef492d..e814c45 100644 --- a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs +++ b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs | |||
@@ -168,7 +168,7 @@ namespace OpenSim.Services.Connectors.Hypergrid | |||
168 | string filename = string.Empty; | 168 | string filename = string.Empty; |
169 | 169 | ||
170 | try | 170 | try |
171 | { | 171 | { |
172 | //m_log.Debug("JPEG: " + imageURL); | 172 | //m_log.Debug("JPEG: " + imageURL); |
173 | string name = regionID.ToString(); | 173 | string name = regionID.ToString(); |
174 | filename = Path.Combine(storagePath, name + ".jpg"); | 174 | filename = Path.Combine(storagePath, name + ".jpg"); |
diff --git a/OpenSim/Services/Connectors/Hypergrid/HeloServicesConnector.cs b/OpenSim/Services/Connectors/Hypergrid/HeloServicesConnector.cs index b5e6d69..91e1740 100644 --- a/OpenSim/Services/Connectors/Hypergrid/HeloServicesConnector.cs +++ b/OpenSim/Services/Connectors/Hypergrid/HeloServicesConnector.cs | |||
@@ -33,7 +33,7 @@ using Nini.Config; | |||
33 | 33 | ||
34 | namespace OpenSim.Services.Connectors | 34 | namespace OpenSim.Services.Connectors |
35 | { | 35 | { |
36 | public class HeloServicesConnector | 36 | public class HeloServicesConnector |
37 | { | 37 | { |
38 | private static readonly ILog m_log = | 38 | private static readonly ILog m_log = |
39 | LogManager.GetLogger( | 39 | LogManager.GetLogger( |
diff --git a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs index 1b45bcf..b261675 100644 --- a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs +++ b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs | |||
@@ -113,7 +113,7 @@ namespace OpenSim.Services.Connectors.Hypergrid | |||
113 | return "homeagent/"; | 113 | return "homeagent/"; |
114 | } | 114 | } |
115 | 115 | ||
116 | // The Login service calls this interface with fromLogin=true | 116 | // The Login service calls this interface with fromLogin=true |
117 | // Sims call it with fromLogin=false | 117 | // Sims call it with fromLogin=false |
118 | // Either way, this is verified by the handler | 118 | // Either way, this is verified by the handler |
119 | public bool LoginAgentToGrid(GridRegion source, AgentCircuitData aCircuit, GridRegion gatekeeper, GridRegion destination, bool fromLogin, out string reason) | 119 | public bool LoginAgentToGrid(GridRegion source, AgentCircuitData aCircuit, GridRegion gatekeeper, GridRegion destination, bool fromLogin, out string reason) |
@@ -159,7 +159,7 @@ namespace OpenSim.Services.Connectors.Hypergrid | |||
159 | } | 159 | } |
160 | 160 | ||
161 | public void SetClientToken(UUID sessionID, string token) | 161 | public void SetClientToken(UUID sessionID, string token) |
162 | { | 162 | { |
163 | // no-op | 163 | // no-op |
164 | } | 164 | } |
165 | 165 | ||
@@ -416,7 +416,7 @@ namespace OpenSim.Services.Connectors.Hypergrid | |||
416 | 416 | ||
417 | XmlRpcRequest request = new XmlRpcRequest("get_online_friends", paramList); | 417 | XmlRpcRequest request = new XmlRpcRequest("get_online_friends", paramList); |
418 | // string reason = string.Empty; | 418 | // string reason = string.Empty; |
419 | 419 | ||
420 | // Send and get reply | 420 | // Send and get reply |
421 | List<UUID> online = new List<UUID>(); | 421 | List<UUID> online = new List<UUID>(); |
422 | XmlRpcResponse response = null; | 422 | XmlRpcResponse response = null; |
@@ -497,7 +497,7 @@ namespace OpenSim.Services.Connectors.Hypergrid | |||
497 | hash["userID"] = userID.ToString(); | 497 | hash["userID"] = userID.ToString(); |
498 | 498 | ||
499 | hash = CallServer("get_server_urls", hash); | 499 | hash = CallServer("get_server_urls", hash); |
500 | 500 | ||
501 | Dictionary<string, object> serverURLs = new Dictionary<string, object>(); | 501 | Dictionary<string, object> serverURLs = new Dictionary<string, object>(); |
502 | foreach (object key in hash.Keys) | 502 | foreach (object key in hash.Keys) |
503 | { | 503 | { |
@@ -516,7 +516,7 @@ namespace OpenSim.Services.Connectors.Hypergrid | |||
516 | Hashtable hash = new Hashtable(); | 516 | Hashtable hash = new Hashtable(); |
517 | hash["userID"] = userID.ToString(); | 517 | hash["userID"] = userID.ToString(); |
518 | 518 | ||
519 | hash = CallServer("locate_user", hash); | 519 | hash = CallServer("locate_user", hash); |
520 | 520 | ||
521 | string url = string.Empty; | 521 | string url = string.Empty; |
522 | 522 | ||
@@ -574,7 +574,7 @@ namespace OpenSim.Services.Connectors.Hypergrid | |||
574 | { | 574 | { |
575 | // We can not use m_ServerURL here anymore because it causes | 575 | // We can not use m_ServerURL here anymore because it causes |
576 | // the HTTP request to be built without a host name. This messes | 576 | // the HTTP request to be built without a host name. This messes |
577 | // with OSGrid's NGINX and can make OSGrid avatars unable to TP | 577 | // with OSGrid's NGINX and can make OSGrid avatars unable to TP |
578 | // to other grids running recent mono. | 578 | // to other grids running recent mono. |
579 | response = request.Send(m_ServerURLHost, 10000); | 579 | response = request.Send(m_ServerURLHost, 10000); |
580 | } | 580 | } |
diff --git a/OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs b/OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs index bd5841b..dcf25ad 100644 --- a/OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs +++ b/OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs | |||
@@ -63,7 +63,7 @@ namespace OpenSim.Services.Connectors | |||
63 | /// In this case, -1 is default timeout (100 seconds), not infinite. | 63 | /// In this case, -1 is default timeout (100 seconds), not infinite. |
64 | /// </remarks> | 64 | /// </remarks> |
65 | private int m_requestTimeoutSecs = -1; | 65 | private int m_requestTimeoutSecs = -1; |
66 | private string m_configName = "InventoryService"; | 66 | private string m_configName = "InventoryService"; |
67 | 67 | ||
68 | private const double CACHE_EXPIRATION_SECONDS = 20.0; | 68 | private const double CACHE_EXPIRATION_SECONDS = 20.0; |
69 | private static ExpiringCache<UUID, InventoryItemBase> m_ItemCache = new ExpiringCache<UUID,InventoryItemBase>(); | 69 | private static ExpiringCache<UUID, InventoryItemBase> m_ItemCache = new ExpiringCache<UUID,InventoryItemBase>(); |
@@ -80,7 +80,7 @@ namespace OpenSim.Services.Connectors | |||
80 | public XInventoryServicesConnector(IConfigSource source, string configName) | 80 | public XInventoryServicesConnector(IConfigSource source, string configName) |
81 | : base(source, configName) | 81 | : base(source, configName) |
82 | { | 82 | { |
83 | m_configName = configName; | 83 | m_configName = configName; |
84 | Initialise(source); | 84 | Initialise(source); |
85 | } | 85 | } |
86 | 86 | ||
@@ -114,13 +114,13 @@ namespace OpenSim.Services.Connectors | |||
114 | 114 | ||
115 | StatsManager.RegisterStat( | 115 | StatsManager.RegisterStat( |
116 | new Stat( | 116 | new Stat( |
117 | "RequestsMade", | 117 | "RequestsMade", |
118 | "Requests made", | 118 | "Requests made", |
119 | "Number of requests made to the remove inventory service", | 119 | "Number of requests made to the remove inventory service", |
120 | "requests", | 120 | "requests", |
121 | "inventory", | 121 | "inventory", |
122 | serviceURI, | 122 | serviceURI, |
123 | StatType.Pull, | 123 | StatType.Pull, |
124 | MeasuresOfInterest.AverageChangeOverTime, | 124 | MeasuresOfInterest.AverageChangeOverTime, |
125 | s => s.Value = RequestsMade, | 125 | s => s.Value = RequestsMade, |
126 | StatVerbosity.Debug)); | 126 | StatVerbosity.Debug)); |
@@ -251,7 +251,7 @@ namespace OpenSim.Services.Connectors | |||
251 | 251 | ||
252 | return inventory; | 252 | return inventory; |
253 | } | 253 | } |
254 | 254 | ||
255 | public virtual InventoryCollection[] GetMultipleFoldersContent(UUID principalID, UUID[] folderIDs) | 255 | public virtual InventoryCollection[] GetMultipleFoldersContent(UUID principalID, UUID[] folderIDs) |
256 | { | 256 | { |
257 | InventoryCollection[] inventoryArr = new InventoryCollection[folderIDs.Length]; | 257 | InventoryCollection[] inventoryArr = new InventoryCollection[folderIDs.Length]; |
@@ -674,7 +674,7 @@ namespace OpenSim.Services.Connectors | |||
674 | { "ASSET", assetID.ToString() } | 674 | { "ASSET", assetID.ToString() } |
675 | }); | 675 | }); |
676 | 676 | ||
677 | // We cannot use CheckReturn() here because valid values for RESULT are "false" (in the case of request failure) or an int | 677 | // We cannot use CheckReturn() here because valid values for RESULT are "false" (in the case of request failure) or an int |
678 | if (ret == null) | 678 | if (ret == null) |
679 | return 0; | 679 | return 0; |
680 | 680 | ||
@@ -719,7 +719,7 @@ namespace OpenSim.Services.Connectors | |||
719 | reply = SynchronousRestFormsRequester.MakeRequest( | 719 | reply = SynchronousRestFormsRequester.MakeRequest( |
720 | "POST", m_ServerURI + "/xinventory", | 720 | "POST", m_ServerURI + "/xinventory", |
721 | ServerUtils.BuildQueryString(sendData), m_requestTimeoutSecs, m_Auth); | 721 | ServerUtils.BuildQueryString(sendData), m_requestTimeoutSecs, m_Auth); |
722 | 722 | ||
723 | if (reply != String.Empty) | 723 | if (reply != String.Empty) |
724 | break; | 724 | break; |
725 | 725 | ||
diff --git a/OpenSim/Services/Connectors/Land/LandServicesConnector.cs b/OpenSim/Services/Connectors/Land/LandServicesConnector.cs index 5e9331e..047880a 100644 --- a/OpenSim/Services/Connectors/Land/LandServicesConnector.cs +++ b/OpenSim/Services/Connectors/Land/LandServicesConnector.cs | |||
@@ -122,12 +122,12 @@ namespace OpenSim.Services.Connectors | |||
122 | catch (Exception e) | 122 | catch (Exception e) |
123 | { | 123 | { |
124 | m_log.ErrorFormat( | 124 | m_log.ErrorFormat( |
125 | "[LAND CONNECTOR]: Got exception while parsing land-data: {0} {1}", | 125 | "[LAND CONNECTOR]: Got exception while parsing land-data: {0} {1}", |
126 | e.Message, e.StackTrace); | 126 | e.Message, e.StackTrace); |
127 | } | 127 | } |
128 | } | 128 | } |
129 | } | 129 | } |
130 | else | 130 | else |
131 | m_log.WarnFormat("[LAND CONNECTOR]: Couldn't find region with handle {0}", regionHandle); | 131 | m_log.WarnFormat("[LAND CONNECTOR]: Couldn't find region with handle {0}", regionHandle); |
132 | } | 132 | } |
133 | catch (Exception e) | 133 | catch (Exception e) |
@@ -135,7 +135,7 @@ namespace OpenSim.Services.Connectors | |||
135 | m_log.ErrorFormat( | 135 | m_log.ErrorFormat( |
136 | "[LAND CONNECTOR]: Couldn't contact region {0}: {1} {2}", regionHandle, e.Message, e.StackTrace); | 136 | "[LAND CONNECTOR]: Couldn't contact region {0}: {1} {2}", regionHandle, e.Message, e.StackTrace); |
137 | } | 137 | } |
138 | 138 | ||
139 | return landData; | 139 | return landData; |
140 | } | 140 | } |
141 | } | 141 | } |
diff --git a/OpenSim/Services/Connectors/Presence/PresenceServicesConnector.cs b/OpenSim/Services/Connectors/Presence/PresenceServicesConnector.cs index 1f14b32..89d64ca 100644 --- a/OpenSim/Services/Connectors/Presence/PresenceServicesConnector.cs +++ b/OpenSim/Services/Connectors/Presence/PresenceServicesConnector.cs | |||
@@ -107,7 +107,7 @@ namespace OpenSim.Services.Connectors | |||
107 | { | 107 | { |
108 | string reply = SynchronousRestFormsRequester.MakeRequest("POST", | 108 | string reply = SynchronousRestFormsRequester.MakeRequest("POST", |
109 | uri, | 109 | uri, |
110 | reqString, | 110 | reqString, |
111 | m_Auth); | 111 | m_Auth); |
112 | if (reply != string.Empty) | 112 | if (reply != string.Empty) |
113 | { | 113 | { |
@@ -315,8 +315,8 @@ namespace OpenSim.Services.Connectors | |||
315 | } | 315 | } |
316 | else | 316 | else |
317 | { | 317 | { |
318 | if (replyData["result"].ToString() == "null") | 318 | if (replyData["result"].ToString() == "null") |
319 | return null; | 319 | return null; |
320 | 320 | ||
321 | m_log.DebugFormat("[PRESENCE CONNECTOR]: Invalid reply (result not dictionary) received from presence server when querying for sessionID {0}", sessionID.ToString()); | 321 | m_log.DebugFormat("[PRESENCE CONNECTOR]: Invalid reply (result not dictionary) received from presence server when querying for sessionID {0}", sessionID.ToString()); |
322 | } | 322 | } |
@@ -366,7 +366,7 @@ namespace OpenSim.Services.Connectors | |||
366 | 366 | ||
367 | if (replyData != null) | 367 | if (replyData != null) |
368 | { | 368 | { |
369 | if (replyData.ContainsKey("result") && | 369 | if (replyData.ContainsKey("result") && |
370 | (replyData["result"].ToString() == "null" || replyData["result"].ToString() == "Failure")) | 370 | (replyData["result"].ToString() == "null" || replyData["result"].ToString() == "Failure")) |
371 | { | 371 | { |
372 | return new PresenceInfo[0]; | 372 | return new PresenceInfo[0]; |
diff --git a/OpenSim/Services/Connectors/Properties/AssemblyInfo.cs b/OpenSim/Services/Connectors/Properties/AssemblyInfo.cs index 3c5ca7d..76d26d6 100644 --- a/OpenSim/Services/Connectors/Properties/AssemblyInfo.cs +++ b/OpenSim/Services/Connectors/Properties/AssemblyInfo.cs | |||
@@ -2,7 +2,7 @@ | |||
2 | using System.Runtime.CompilerServices; | 2 | using System.Runtime.CompilerServices; |
3 | using System.Runtime.InteropServices; | 3 | using System.Runtime.InteropServices; |
4 | 4 | ||
5 | // General Information about an assembly is controlled through the following | 5 | // General Information about an assembly is controlled through the following |
6 | // set of attributes. Change these attribute values to modify the information | 6 | // set of attributes. Change these attribute values to modify the information |
7 | // associated with an assembly. | 7 | // associated with an assembly. |
8 | [assembly: AssemblyTitle("OpenSim.Services.Connectors")] | 8 | [assembly: AssemblyTitle("OpenSim.Services.Connectors")] |
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices; | |||
14 | [assembly: AssemblyTrademark("")] | 14 | [assembly: AssemblyTrademark("")] |
15 | [assembly: AssemblyCulture("")] | 15 | [assembly: AssemblyCulture("")] |
16 | 16 | ||
17 | // Setting ComVisible to false makes the types in this assembly not visible | 17 | // Setting ComVisible to false makes the types in this assembly not visible |
18 | // to COM components. If you need to access a type in this assembly from | 18 | // to COM components. If you need to access a type in this assembly from |
19 | // COM, set the ComVisible attribute to true on that type. | 19 | // COM, set the ComVisible attribute to true on that type. |
20 | [assembly: ComVisible(false)] | 20 | [assembly: ComVisible(false)] |
21 | 21 | ||
@@ -25,7 +25,7 @@ using System.Runtime.InteropServices; | |||
25 | // Version information for an assembly consists of the following four values: | 25 | // Version information for an assembly consists of the following four values: |
26 | // | 26 | // |
27 | // Major Version | 27 | // Major Version |
28 | // Minor Version | 28 | // Minor Version |
29 | // Build Number | 29 | // Build Number |
30 | // Revision | 30 | // Revision |
31 | // | 31 | // |
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; | |||
42 | namespace OpenSim.Services.Connectors.SimianGrid | 42 | namespace 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 |
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs index 8e1bf37..9f4d89a 100644 --- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs +++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | |||
@@ -50,7 +50,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
50 | 50 | ||
51 | // we use this dictionary to track the pending updateagent requests, maps URI --> position update | 51 | // we use this dictionary to track the pending updateagent requests, maps URI --> position update |
52 | private Dictionary<string,AgentPosition> m_updateAgentQueue = new Dictionary<string,AgentPosition>(); | 52 | private Dictionary<string,AgentPosition> m_updateAgentQueue = new Dictionary<string,AgentPosition>(); |
53 | 53 | ||
54 | //private GridRegion m_Region; | 54 | //private GridRegion m_Region; |
55 | 55 | ||
56 | public SimulationServiceConnector() | 56 | public SimulationServiceConnector() |
@@ -119,7 +119,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
119 | m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: Creating agent at {0}", destination.ServerURI); | 119 | m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: Creating agent at {0}", destination.ServerURI); |
120 | 120 | ||
121 | string uri = destination.ServerURI + AgentPath() + aCircuit.AgentID + "/"; | 121 | string uri = destination.ServerURI + AgentPath() + aCircuit.AgentID + "/"; |
122 | 122 | ||
123 | try | 123 | try |
124 | { | 124 | { |
125 | OSDMap args = aCircuit.PackAgentCircuitData(ctx); | 125 | OSDMap args = aCircuit.PackAgentCircuitData(ctx); |
@@ -137,7 +137,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
137 | myipaddress = data["your_ip"].AsString(); | 137 | myipaddress = data["your_ip"].AsString(); |
138 | return success; | 138 | return success; |
139 | } | 139 | } |
140 | 140 | ||
141 | // Try the old version, uncompressed | 141 | // Try the old version, uncompressed |
142 | result = WebUtil.PostToService(uri, args, 30000, false); | 142 | result = WebUtil.PostToService(uri, args, 30000, false); |
143 | 143 | ||
@@ -155,10 +155,10 @@ namespace OpenSim.Services.Connectors.Simulation | |||
155 | return success; | 155 | return success; |
156 | } | 156 | } |
157 | } | 157 | } |
158 | 158 | ||
159 | m_log.WarnFormat( | 159 | m_log.WarnFormat( |
160 | "[REMOTE SIMULATION CONNECTOR]: Failed to create agent {0} {1} at remote simulator {2}", | 160 | "[REMOTE SIMULATION CONNECTOR]: Failed to create agent {0} {1} at remote simulator {2}", |
161 | aCircuit.firstname, aCircuit.lastname, destination.RegionName); | 161 | aCircuit.firstname, aCircuit.lastname, destination.RegionName); |
162 | reason = result["Message"] != null ? result["Message"].AsString() : "error"; | 162 | reason = result["Message"] != null ? result["Message"].AsString() : "error"; |
163 | return false; | 163 | return false; |
164 | } | 164 | } |
@@ -202,8 +202,8 @@ namespace OpenSim.Services.Connectors.Simulation | |||
202 | { | 202 | { |
203 | if (m_updateAgentQueue.ContainsKey(uri)) | 203 | if (m_updateAgentQueue.ContainsKey(uri)) |
204 | { | 204 | { |
205 | // Another thread is already handling | 205 | // Another thread is already handling |
206 | // updates for this simulator, just update | 206 | // updates for this simulator, just update |
207 | // the position and return, overwrites are | 207 | // the position and return, overwrites are |
208 | // not a problem since we only care about the | 208 | // not a problem since we only care about the |
209 | // last update anyway | 209 | // last update anyway |
@@ -304,7 +304,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
304 | OSDMap request = new OSDMap(); | 304 | OSDMap request = new OSDMap(); |
305 | request.Add("viaTeleport", OSD.FromBoolean(viaTeleport)); | 305 | request.Add("viaTeleport", OSD.FromBoolean(viaTeleport)); |
306 | request.Add("position", OSD.FromString(position.ToString())); | 306 | request.Add("position", OSD.FromString(position.ToString())); |
307 | // To those who still understad this field, we're telling them | 307 | // To those who still understad this field, we're telling them |
308 | // the lowest version just to be safe | 308 | // the lowest version just to be safe |
309 | request.Add("my_version", OSD.FromString(String.Format("SIMULATION/{0}", VersionInfo.SimulationServiceVersionSupportedMin))); | 309 | request.Add("my_version", OSD.FromString(String.Format("SIMULATION/{0}", VersionInfo.SimulationServiceVersionSupportedMin))); |
310 | // New simulation service negotiation | 310 | // New simulation service negotiation |
@@ -374,7 +374,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
374 | m_log.Info("[REMOTE SIMULATION CONNECTOR]: The above web util error was caused by a TP to a sim that doesn't support QUERYACCESS and can be ignored"); | 374 | m_log.Info("[REMOTE SIMULATION CONNECTOR]: The above web util error was caused by a TP to a sim that doesn't support QUERYACCESS and can be ignored"); |
375 | return true; | 375 | return true; |
376 | } | 376 | } |
377 | 377 | ||
378 | reason = result["Message"]; | 378 | reason = result["Message"]; |
379 | } | 379 | } |
380 | else | 380 | else |
@@ -410,7 +410,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
410 | { | 410 | { |
411 | m_log.WarnFormat("[REMOTE SIMULATION CONNECTOR] QueryAcesss failed with exception; {0}",e.ToString()); | 411 | m_log.WarnFormat("[REMOTE SIMULATION CONNECTOR] QueryAcesss failed with exception; {0}",e.ToString()); |
412 | } | 412 | } |
413 | 413 | ||
414 | return false; | 414 | return false; |
415 | } | 415 | } |
416 | 416 | ||
@@ -428,7 +428,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
428 | { | 428 | { |
429 | m_log.WarnFormat("[REMOTE SIMULATION CONNECTOR] ReleaseAgent failed with exception; {0}",e.ToString()); | 429 | m_log.WarnFormat("[REMOTE SIMULATION CONNECTOR] ReleaseAgent failed with exception; {0}",e.ToString()); |
430 | } | 430 | } |
431 | 431 | ||
432 | return true; | 432 | return true; |
433 | } | 433 | } |
434 | 434 | ||
diff --git a/OpenSim/Services/Connectors/UserAccounts/UserAccountServicesConnector.cs b/OpenSim/Services/Connectors/UserAccounts/UserAccountServicesConnector.cs index 5bc7a1c..68ae7bb 100644 --- a/OpenSim/Services/Connectors/UserAccounts/UserAccountServicesConnector.cs +++ b/OpenSim/Services/Connectors/UserAccounts/UserAccountServicesConnector.cs | |||
@@ -198,7 +198,7 @@ namespace OpenSim.Services.Connectors | |||
198 | accs = doGetMultiUserAccounts(scopeID, IDs, out multisuported); | 198 | accs = doGetMultiUserAccounts(scopeID, IDs, out multisuported); |
199 | if(multisuported) | 199 | if(multisuported) |
200 | return accs; | 200 | return accs; |
201 | 201 | ||
202 | // service does not do multi accounts so need to do it one by one | 202 | // service does not do multi accounts so need to do it one by one |
203 | 203 | ||
204 | UUID uuid = UUID.Zero; | 204 | UUID uuid = UUID.Zero; |
@@ -344,7 +344,7 @@ namespace OpenSim.Services.Connectors | |||
344 | 344 | ||
345 | return SendAndGetReply(sendData); | 345 | return SendAndGetReply(sendData); |
346 | } | 346 | } |
347 | 347 | ||
348 | private UserAccount SendAndGetReply(Dictionary<string, object> sendData) | 348 | private UserAccount SendAndGetReply(Dictionary<string, object> sendData) |
349 | { | 349 | { |
350 | string reply = string.Empty; | 350 | string reply = string.Empty; |