diff options
21 files changed, 107 insertions, 101 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index e416d05..eb5c0f5 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -3493,9 +3493,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3493 | ani.AnimationList[i].AnimSequenceID = seqs[i]; | 3493 | ani.AnimationList[i].AnimSequenceID = seqs[i]; |
3494 | 3494 | ||
3495 | ani.AnimationSourceList[i] = new AvatarAnimationPacket.AnimationSourceListBlock(); | 3495 | ani.AnimationSourceList[i] = new AvatarAnimationPacket.AnimationSourceListBlock(); |
3496 | ani.AnimationSourceList[i].ObjectID = objectIDs[i]; | 3496 | if (objectIDs[i].Equals(sourceAgentId)) |
3497 | if (objectIDs[i] == UUID.Zero) | 3497 | ani.AnimationSourceList[i].ObjectID = UUID.Zero; |
3498 | ani.AnimationSourceList[i].ObjectID = sourceAgentId; | 3498 | else |
3499 | ani.AnimationSourceList[i].ObjectID = objectIDs[i]; | ||
3499 | } | 3500 | } |
3500 | ani.Header.Reliable = false; | 3501 | ani.Header.Reliable = false; |
3501 | OutPacket(ani, ThrottleOutPacketType.Task); | 3502 | OutPacket(ani, ThrottleOutPacketType.Task); |
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs index 6985449..f969bc3 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs | |||
@@ -585,8 +585,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
585 | 585 | ||
586 | // Stats tracking | 586 | // Stats tracking |
587 | Interlocked.Increment(ref udpClient.PacketsSent); | 587 | Interlocked.Increment(ref udpClient.PacketsSent); |
588 | if (isReliable) | ||
589 | Interlocked.Add(ref udpClient.UnackedBytes, outgoingPacket.Buffer.DataLength); | ||
590 | 588 | ||
591 | // Put the UDP payload on the wire | 589 | // Put the UDP payload on the wire |
592 | AsyncBeginSend(buffer); | 590 | AsyncBeginSend(buffer); |
@@ -859,9 +857,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
859 | // Acknowledge the UseCircuitCode packet | 857 | // Acknowledge the UseCircuitCode packet |
860 | SendAckImmediate(remoteEndPoint, packet.Header.Sequence); | 858 | SendAckImmediate(remoteEndPoint, packet.Header.Sequence); |
861 | 859 | ||
862 | m_log.DebugFormat( | 860 | // m_log.DebugFormat( |
863 | "[LLUDPSERVER]: Handling UseCircuitCode request from {0} took {1}ms", | 861 | // "[LLUDPSERVER]: Handling UseCircuitCode request from {0} took {1}ms", |
864 | buffer.RemoteEndPoint, (DateTime.Now - startTime).Milliseconds); | 862 | // buffer.RemoteEndPoint, (DateTime.Now - startTime).Milliseconds); |
865 | } | 863 | } |
866 | 864 | ||
867 | private void SendAckImmediate(IPEndPoint remoteEndpoint, uint sequenceNumber) | 865 | private void SendAckImmediate(IPEndPoint remoteEndpoint, uint sequenceNumber) |
diff --git a/OpenSim/Region/ClientStack/LindenUDP/UnackedPacketCollection.cs b/OpenSim/Region/ClientStack/LindenUDP/UnackedPacketCollection.cs index 4cb4aee..9d40688 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/UnackedPacketCollection.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/UnackedPacketCollection.cs | |||
@@ -28,6 +28,7 @@ | |||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Net; | 30 | using System.Net; |
31 | using System.Threading; | ||
31 | using OpenMetaverse; | 32 | using OpenMetaverse; |
32 | 33 | ||
33 | namespace OpenSim.Region.ClientStack.LindenUDP | 34 | namespace OpenSim.Region.ClientStack.LindenUDP |
@@ -77,6 +78,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
77 | public void Add(OutgoingPacket packet) | 78 | public void Add(OutgoingPacket packet) |
78 | { | 79 | { |
79 | m_pendingAdds.Enqueue(packet); | 80 | m_pendingAdds.Enqueue(packet); |
81 | Interlocked.Add(ref packet.Client.UnackedBytes, packet.Buffer.DataLength); | ||
80 | } | 82 | } |
81 | 83 | ||
82 | /// <summary> | 84 | /// <summary> |
@@ -139,46 +141,31 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
139 | private void ProcessQueues() | 141 | private void ProcessQueues() |
140 | { | 142 | { |
141 | // Process all the pending adds | 143 | // Process all the pending adds |
142 | |||
143 | OutgoingPacket pendingAdd; | 144 | OutgoingPacket pendingAdd; |
144 | if (m_pendingAdds != null) | 145 | while (m_pendingAdds.TryDequeue(out pendingAdd)) |
145 | { | 146 | m_packets[pendingAdd.SequenceNumber] = pendingAdd; |
146 | while (m_pendingAdds.TryDequeue(out pendingAdd)) | ||
147 | { | ||
148 | if (pendingAdd != null && m_packets != null) | ||
149 | { | ||
150 | m_packets[pendingAdd.SequenceNumber] = pendingAdd; | ||
151 | } | ||
152 | } | ||
153 | } | ||
154 | 147 | ||
155 | // Process all the pending removes, including updating statistics and round-trip times | 148 | // Process all the pending removes, including updating statistics and round-trip times |
156 | PendingAck pendingRemove; | 149 | PendingAck pendingRemove; |
157 | OutgoingPacket ackedPacket; | 150 | OutgoingPacket ackedPacket; |
158 | if (m_pendingRemoves != null) | 151 | while (m_pendingRemoves.TryDequeue(out pendingRemove)) |
159 | { | 152 | { |
160 | while (m_pendingRemoves.TryDequeue(out pendingRemove)) | 153 | if (m_packets.TryGetValue(pendingRemove.SequenceNumber, out ackedPacket)) |
161 | { | 154 | { |
162 | if (m_pendingRemoves != null && m_packets != null) | 155 | m_packets.Remove(pendingRemove.SequenceNumber); |
156 | |||
157 | // Update stats | ||
158 | Interlocked.Add(ref ackedPacket.Client.UnackedBytes, -ackedPacket.Buffer.DataLength); | ||
159 | |||
160 | if (!pendingRemove.FromResend) | ||
163 | { | 161 | { |
164 | if (m_packets.TryGetValue(pendingRemove.SequenceNumber, out ackedPacket)) | 162 | // Calculate the round-trip time for this packet and its ACK |
165 | { | 163 | int rtt = pendingRemove.RemoveTime - ackedPacket.TickCount; |
166 | m_packets.Remove(pendingRemove.SequenceNumber); | 164 | if (rtt > 0) |
167 | 165 | ackedPacket.Client.UpdateRoundTrip(rtt); | |
168 | // Update stats | ||
169 | System.Threading.Interlocked.Add(ref ackedPacket.Client.UnackedBytes, -ackedPacket.Buffer.DataLength); | ||
170 | |||
171 | if (!pendingRemove.FromResend) | ||
172 | { | ||
173 | // Calculate the round-trip time for this packet and its ACK | ||
174 | int rtt = pendingRemove.RemoveTime - ackedPacket.TickCount; | ||
175 | if (rtt > 0) | ||
176 | ackedPacket.Client.UpdateRoundTrip(rtt); | ||
177 | } | ||
178 | } | ||
179 | } | 166 | } |
180 | } | 167 | } |
181 | } | 168 | } |
182 | } | 169 | } |
183 | } | 170 | } |
184 | } | 171 | } \ No newline at end of file |
diff --git a/OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs b/OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs index 36aaab3..8347e35 100644 --- a/OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs | |||
@@ -102,7 +102,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Assets | |||
102 | { | 102 | { |
103 | UUID capID = UUID.Random(); | 103 | UUID capID = UUID.Random(); |
104 | 104 | ||
105 | m_log.Info("[GETMESH]: /CAPS/" + capID); | 105 | // m_log.Info("[GETMESH]: /CAPS/" + capID); |
106 | caps.RegisterHandler("GetMesh", | 106 | caps.RegisterHandler("GetMesh", |
107 | new RestHTTPHandler("GET", "/CAPS/" + capID, | 107 | new RestHTTPHandler("GET", "/CAPS/" + capID, |
108 | delegate(Hashtable m_dhttpMethod) | 108 | delegate(Hashtable m_dhttpMethod) |
diff --git a/OpenSim/Region/CoreModules/Avatar/Assets/GetTextureModule.cs b/OpenSim/Region/CoreModules/Avatar/Assets/GetTextureModule.cs index 1f60e36..6fb8b46 100644 --- a/OpenSim/Region/CoreModules/Avatar/Assets/GetTextureModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Assets/GetTextureModule.cs | |||
@@ -105,7 +105,7 @@ namespace OpenSim.Region.CoreModules.Avatar.ObjectCaps | |||
105 | { | 105 | { |
106 | UUID capID = UUID.Random(); | 106 | UUID capID = UUID.Random(); |
107 | 107 | ||
108 | m_log.InfoFormat("[GETTEXTURE]: /CAPS/{0} in region {1}", capID, m_scene.RegionInfo.RegionName); | 108 | // m_log.InfoFormat("[GETTEXTURE]: /CAPS/{0} in region {1}", capID, m_scene.RegionInfo.RegionName); |
109 | caps.RegisterHandler("GetTexture", new StreamHandler("GET", "/CAPS/" + capID, ProcessGetTexture)); | 109 | caps.RegisterHandler("GetTexture", new StreamHandler("GET", "/CAPS/" + capID, ProcessGetTexture)); |
110 | } | 110 | } |
111 | 111 | ||
@@ -171,7 +171,7 @@ namespace OpenSim.Region.CoreModules.Avatar.ObjectCaps | |||
171 | /// <returns>False for "caller try another codec"; true otherwise</returns> | 171 | /// <returns>False for "caller try another codec"; true otherwise</returns> |
172 | private bool FetchTexture(OSHttpRequest httpRequest, OSHttpResponse httpResponse, UUID textureID, string format) | 172 | private bool FetchTexture(OSHttpRequest httpRequest, OSHttpResponse httpResponse, UUID textureID, string format) |
173 | { | 173 | { |
174 | m_log.DebugFormat("[GETTEXTURE]: {0} with requested format {1}", textureID, format); | 174 | // m_log.DebugFormat("[GETTEXTURE]: {0} with requested format {1}", textureID, format); |
175 | AssetBase texture; | 175 | AssetBase texture; |
176 | 176 | ||
177 | string fullID = textureID.ToString(); | 177 | string fullID = textureID.ToString(); |
diff --git a/OpenSim/Region/CoreModules/Avatar/ObjectCaps/ObjectAdd.cs b/OpenSim/Region/CoreModules/Avatar/ObjectCaps/ObjectAdd.cs index c011776..008233b 100644 --- a/OpenSim/Region/CoreModules/Avatar/ObjectCaps/ObjectAdd.cs +++ b/OpenSim/Region/CoreModules/Avatar/ObjectCaps/ObjectAdd.cs | |||
@@ -63,7 +63,7 @@ namespace OpenSim.Region.CoreModules.Avatar.ObjectCaps | |||
63 | { | 63 | { |
64 | UUID capuuid = UUID.Random(); | 64 | UUID capuuid = UUID.Random(); |
65 | 65 | ||
66 | m_log.InfoFormat("[OBJECTADD]: {0}", "/CAPS/OA/" + capuuid + "/"); | 66 | // m_log.InfoFormat("[OBJECTADD]: {0}", "/CAPS/OA/" + capuuid + "/"); |
67 | 67 | ||
68 | caps.RegisterHandler("ObjectAdd", | 68 | caps.RegisterHandler("ObjectAdd", |
69 | new RestHTTPHandler("POST", "/CAPS/OA/" + capuuid + "/", | 69 | new RestHTTPHandler("POST", "/CAPS/OA/" + capuuid + "/", |
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs index f9d28b9..e0f36a2 100644 --- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | |||
@@ -641,7 +641,17 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
641 | lock (m_openRequests) | 641 | lock (m_openRequests) |
642 | m_openRequests.Add(requestID, mrs); | 642 | m_openRequests.Add(requestID, mrs); |
643 | 643 | ||
644 | WebRequest mapitemsrequest = WebRequest.Create(httpserver); | 644 | WebRequest mapitemsrequest = null; |
645 | try | ||
646 | { | ||
647 | mapitemsrequest = WebRequest.Create(httpserver); | ||
648 | } | ||
649 | catch (Exception e) | ||
650 | { | ||
651 | m_log.DebugFormat("[WORLD MAP]: Access to {0} failed with {1}", httpserver, e); | ||
652 | return new OSDMap(); | ||
653 | } | ||
654 | |||
645 | mapitemsrequest.Method = "POST"; | 655 | mapitemsrequest.Method = "POST"; |
646 | mapitemsrequest.ContentType = "application/xml+llsd"; | 656 | mapitemsrequest.ContentType = "application/xml+llsd"; |
647 | OSDMap RAMap = new OSDMap(); | 657 | OSDMap RAMap = new OSDMap(); |
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 927f78d..6a3983f 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -1054,10 +1054,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
1054 | //else | 1054 | //else |
1055 | // m_log.ErrorFormat("[SCENE]: Could not find user info for {0} when making it a root agent", m_uuid); | 1055 | // m_log.ErrorFormat("[SCENE]: Could not find user info for {0} when making it a root agent", m_uuid); |
1056 | 1056 | ||
1057 | // On the next prim update, all objects will be sent | ||
1058 | // | ||
1059 | m_sceneViewer.Reset(); | ||
1060 | |||
1061 | m_isChildAgent = false; | 1057 | m_isChildAgent = false; |
1062 | 1058 | ||
1063 | // send the animations of the other presences to me | 1059 | // send the animations of the other presences to me |
@@ -1241,7 +1237,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1241 | /// </summary> | 1237 | /// </summary> |
1242 | public void CompleteMovement(IClientAPI client) | 1238 | public void CompleteMovement(IClientAPI client) |
1243 | { | 1239 | { |
1244 | DateTime startTime = DateTime.Now; | 1240 | // DateTime startTime = DateTime.Now; |
1245 | 1241 | ||
1246 | m_log.DebugFormat( | 1242 | m_log.DebugFormat( |
1247 | "[SCENE PRESENCE]: Completing movement of {0} into region {1}", | 1243 | "[SCENE PRESENCE]: Completing movement of {0} into region {1}", |
@@ -1294,9 +1290,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
1294 | friendsModule.SendFriendsOnlineIfNeeded(ControllingClient); | 1290 | friendsModule.SendFriendsOnlineIfNeeded(ControllingClient); |
1295 | } | 1291 | } |
1296 | 1292 | ||
1297 | m_log.DebugFormat( | 1293 | // m_log.DebugFormat( |
1298 | "[SCENE PRESENCE]: Completing movement of {0} into region {1} took {2}ms", | 1294 | // "[SCENE PRESENCE]: Completing movement of {0} into region {1} took {2}ms", |
1299 | client.Name, Scene.RegionInfo.RegionName, (DateTime.Now - startTime).Milliseconds); | 1295 | // client.Name, Scene.RegionInfo.RegionName, (DateTime.Now - startTime).Milliseconds); |
1300 | } | 1296 | } |
1301 | 1297 | ||
1302 | /// <summary> | 1298 | /// <summary> |
@@ -3311,10 +3307,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
3311 | if ((cAgentData.Throttles != null) && cAgentData.Throttles.Length > 0) | 3307 | if ((cAgentData.Throttles != null) && cAgentData.Throttles.Length > 0) |
3312 | ControllingClient.SetChildAgentThrottle(cAgentData.Throttles); | 3308 | ControllingClient.SetChildAgentThrottle(cAgentData.Throttles); |
3313 | 3309 | ||
3314 | // Sends out the objects in the user's draw distance if m_sendTasksToChild is true. | ||
3315 | if (m_scene.m_seeIntoRegionFromNeighbor) | ||
3316 | m_sceneViewer.Reset(); | ||
3317 | |||
3318 | //cAgentData.AVHeight; | 3310 | //cAgentData.AVHeight; |
3319 | m_rootRegionHandle = cAgentData.RegionHandle; | 3311 | m_rootRegionHandle = cAgentData.RegionHandle; |
3320 | //m_velocity = cAgentData.Velocity; | 3312 | //m_velocity = cAgentData.Velocity; |
diff --git a/OpenSim/Server/Handlers/Hypergrid/HomeAgentHandlers.cs b/OpenSim/Server/Handlers/Hypergrid/HomeAgentHandlers.cs index a5ec4f2..968c1e6 100644 --- a/OpenSim/Server/Handlers/Hypergrid/HomeAgentHandlers.cs +++ b/OpenSim/Server/Handlers/Hypergrid/HomeAgentHandlers.cs | |||
@@ -215,13 +215,22 @@ namespace OpenSim.Server.Handlers.Hypergrid | |||
215 | 215 | ||
216 | // We're behind a proxy | 216 | // We're behind a proxy |
217 | Hashtable headers = (Hashtable)request["headers"]; | 217 | Hashtable headers = (Hashtable)request["headers"]; |
218 | if (headers.ContainsKey("X-Forwarded-For") && headers["X-Forwarded-For"] != null) | 218 | string xff = "X-Forwarded-For"; |
219 | if (headers.ContainsKey(xff.ToLower())) | ||
220 | xff = xff.ToLower(); | ||
221 | |||
222 | if (!headers.ContainsKey(xff) || headers[xff] == null) | ||
219 | { | 223 | { |
220 | IPEndPoint ep = Util.GetClientIPFromXFF((string)headers["X-Forwarded-For"]); | 224 | m_log.WarnFormat("[AGENT HANDLER]: No XFF header"); |
221 | if (ep != null) | 225 | return Util.GetCallerIP(request); |
222 | return ep.Address.ToString(); | ||
223 | } | 226 | } |
224 | 227 | ||
228 | m_log.DebugFormat("[AGENT HANDLER]: XFF is {0}", headers[xff]); | ||
229 | |||
230 | IPEndPoint ep = Util.GetClientIPFromXFF((string)headers[xff]); | ||
231 | if (ep != null) | ||
232 | return ep.Address.ToString(); | ||
233 | |||
225 | // Oops | 234 | // Oops |
226 | return Util.GetCallerIP(request); | 235 | return Util.GetCallerIP(request); |
227 | } | 236 | } |
diff --git a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs index 8aa410b..6d01f80 100644 --- a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs +++ b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs | |||
@@ -205,13 +205,22 @@ namespace OpenSim.Server.Handlers.Simulation | |||
205 | 205 | ||
206 | // We're behind a proxy | 206 | // We're behind a proxy |
207 | Hashtable headers = (Hashtable)request["headers"]; | 207 | Hashtable headers = (Hashtable)request["headers"]; |
208 | if (headers.ContainsKey("X-Forwarded-For") && headers["X-Forwarded-For"] != null) | 208 | string xff = "X-Forwarded-For"; |
209 | if (headers.ContainsKey(xff.ToLower())) | ||
210 | xff = xff.ToLower(); | ||
211 | |||
212 | if (!headers.ContainsKey(xff) || headers[xff] == null) | ||
209 | { | 213 | { |
210 | IPEndPoint ep = Util.GetClientIPFromXFF((string)headers["X-Forwarded-For"]); | 214 | m_log.WarnFormat("[AGENT HANDLER]: No XFF header"); |
211 | if (ep != null) | 215 | return Util.GetCallerIP(request); |
212 | return ep.Address.ToString(); | ||
213 | } | 216 | } |
214 | 217 | ||
218 | m_log.DebugFormat("[AGENT HANDLER]: XFF is {0}", headers[xff]); | ||
219 | |||
220 | IPEndPoint ep = Util.GetClientIPFromXFF((string)headers[xff]); | ||
221 | if (ep != null) | ||
222 | return ep.Address.ToString(); | ||
223 | |||
215 | // Oops | 224 | // Oops |
216 | return Util.GetCallerIP(request); | 225 | return Util.GetCallerIP(request); |
217 | } | 226 | } |
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 | { |
diff --git a/OpenSim/Services/HypergridService/GatekeeperService.cs b/OpenSim/Services/HypergridService/GatekeeperService.cs index bbddd87..b66bfed 100644 --- a/OpenSim/Services/HypergridService/GatekeeperService.cs +++ b/OpenSim/Services/HypergridService/GatekeeperService.cs | |||
@@ -303,7 +303,7 @@ namespace OpenSim.Services.HypergridService | |||
303 | return m_UserAgentService.VerifyAgent(aCircuit.SessionID, aCircuit.ServiceSessionID); | 303 | return m_UserAgentService.VerifyAgent(aCircuit.SessionID, aCircuit.ServiceSessionID); |
304 | else | 304 | else |
305 | { | 305 | { |
306 | Object[] args = new Object[] { userURL }; | 306 | // Object[] args = new Object[] { userURL }; |
307 | IUserAgentService userAgentService = new UserAgentServiceConnector(userURL); | 307 | IUserAgentService userAgentService = new UserAgentServiceConnector(userURL); |
308 | if (userAgentService != null) | 308 | if (userAgentService != null) |
309 | { | 309 | { |
diff --git a/OpenSim/Services/HypergridService/UserAccountCache.cs b/OpenSim/Services/HypergridService/UserAccountCache.cs index c431060..e0a3e61 100644 --- a/OpenSim/Services/HypergridService/UserAccountCache.cs +++ b/OpenSim/Services/HypergridService/UserAccountCache.cs | |||
@@ -13,9 +13,10 @@ namespace OpenSim.Services.HypergridService | |||
13 | { | 13 | { |
14 | private const double CACHE_EXPIRATION_SECONDS = 120000.0; // 33 hours! | 14 | private const double CACHE_EXPIRATION_SECONDS = 120000.0; // 33 hours! |
15 | 15 | ||
16 | private static readonly ILog m_log = | 16 | // private static readonly ILog m_log = |
17 | LogManager.GetLogger( | 17 | // LogManager.GetLogger( |
18 | MethodBase.GetCurrentMethod().DeclaringType); | 18 | // MethodBase.GetCurrentMethod().DeclaringType); |
19 | |||
19 | private ExpiringCache<UUID, UserAccount> m_UUIDCache; | 20 | private ExpiringCache<UUID, UserAccount> m_UUIDCache; |
20 | 21 | ||
21 | private IUserAccountService m_UserAccountService; | 22 | private IUserAccountService m_UserAccountService; |
diff --git a/OpenSim/Services/LLLoginService/LLLoginResponse.cs b/OpenSim/Services/LLLoginService/LLLoginResponse.cs index e98cc22..2ffcaf7 100644 --- a/OpenSim/Services/LLLoginService/LLLoginResponse.cs +++ b/OpenSim/Services/LLLoginService/LLLoginResponse.cs | |||
@@ -667,7 +667,7 @@ namespace OpenSim.Services.LLLoginService | |||
667 | protected virtual ArrayList GetInventoryLibrary(ILibraryService library) | 667 | protected virtual ArrayList GetInventoryLibrary(ILibraryService library) |
668 | { | 668 | { |
669 | Dictionary<UUID, InventoryFolderImpl> rootFolders = library.GetAllFolders(); | 669 | Dictionary<UUID, InventoryFolderImpl> rootFolders = library.GetAllFolders(); |
670 | m_log.DebugFormat("[LLOGIN]: Library has {0} folders", rootFolders.Count); | 670 | // m_log.DebugFormat("[LLOGIN]: Library has {0} folders", rootFolders.Count); |
671 | //Dictionary<UUID, InventoryFolderImpl> rootFolders = new Dictionary<UUID,InventoryFolderImpl>(); | 671 | //Dictionary<UUID, InventoryFolderImpl> rootFolders = new Dictionary<UUID,InventoryFolderImpl>(); |
672 | ArrayList folderHashes = new ArrayList(); | 672 | ArrayList folderHashes = new ArrayList(); |
673 | 673 | ||
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs index 93e4a8f..6c4dc4d 100644 --- a/OpenSim/Services/LLLoginService/LLLoginService.cs +++ b/OpenSim/Services/LLLoginService/LLLoginService.cs | |||
@@ -289,7 +289,7 @@ namespace OpenSim.Services.LLLoginService | |||
289 | 289 | ||
290 | // Get active gestures | 290 | // Get active gestures |
291 | List<InventoryItemBase> gestures = m_InventoryService.GetActiveGestures(account.PrincipalID); | 291 | List<InventoryItemBase> gestures = m_InventoryService.GetActiveGestures(account.PrincipalID); |
292 | m_log.DebugFormat("[LLOGIN SERVICE]: {0} active gestures", gestures.Count); | 292 | // m_log.DebugFormat("[LLOGIN SERVICE]: {0} active gestures", gestures.Count); |
293 | 293 | ||
294 | // | 294 | // |
295 | // Login the presence | 295 | // Login the presence |