aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2010-10-30 00:56:42 +0100
committerMelanie2010-10-30 00:56:42 +0100
commit7503c4ad6148d0483b0465911ee94bb6ccc9cb0a (patch)
treeafb5fb0be6c41e4f47d5177903443e753b93e904 /OpenSim
parentREAD CAREFULLY!!! This is a BROKEN commit. It is UNTESTED and INCOMPLETE. (diff)
parentChange level of some logging messages, turning some info into arguably more a... (diff)
downloadopensim-SC_OLD-7503c4ad6148d0483b0465911ee94bb6ccc9cb0a.zip
opensim-SC_OLD-7503c4ad6148d0483b0465911ee94bb6ccc9cb0a.tar.gz
opensim-SC_OLD-7503c4ad6148d0483b0465911ee94bb6ccc9cb0a.tar.bz2
opensim-SC_OLD-7503c4ad6148d0483b0465911ee94bb6ccc9cb0a.tar.xz
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/AvatarAppearance.cs35
-rw-r--r--OpenSim/Framework/Capabilities/Caps.cs4
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs10
-rw-r--r--OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs47
-rw-r--r--OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs11
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/ActivityDetector.cs4
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/PresenceDetector.cs4
-rw-r--r--OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs26
-rw-r--r--OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs56
-rw-r--r--OpenSim/Services/PresenceService/PresenceService.cs2
11 files changed, 98 insertions, 103 deletions
diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs
index f378e96..ee60622 100644
--- a/OpenSim/Framework/AvatarAppearance.cs
+++ b/OpenSim/Framework/AvatarAppearance.cs
@@ -101,9 +101,8 @@ namespace OpenSim.Framework
101 101
102 public AvatarAppearance(UUID owner) 102 public AvatarAppearance(UUID owner)
103 { 103 {
104// DEBUG ON 104// m_log.WarnFormat("[AVATAR APPEARANCE]: create empty appearance for {0}",owner);
105 m_log.WarnFormat("[AVATAR APPEARANCE] create empty appearance for {0}",owner); 105
106// DEBUG OFF
107 m_serial = 1; 106 m_serial = 1;
108 m_owner = owner; 107 m_owner = owner;
109 108
@@ -117,9 +116,8 @@ namespace OpenSim.Framework
117 116
118 public AvatarAppearance(UUID avatarID, OSDMap map) 117 public AvatarAppearance(UUID avatarID, OSDMap map)
119 { 118 {
120// DEBUG ON 119// m_log.WarnFormat("[AVATAR APPEARANCE]: create appearance for {0} from OSDMap",avatarID);
121 m_log.WarnFormat("[AVATAR APPEARANCE] create appearance for {0} from OSDMap",avatarID); 120
122// DEBUG OFF
123 m_owner = avatarID; 121 m_owner = avatarID;
124 Unpack(map); 122 Unpack(map);
125 SetHeight(); 123 SetHeight();
@@ -127,9 +125,8 @@ namespace OpenSim.Framework
127 125
128 public AvatarAppearance(UUID avatarID, AvatarWearable[] wearables, Primitive.TextureEntry textureEntry, byte[] visualParams) 126 public AvatarAppearance(UUID avatarID, AvatarWearable[] wearables, Primitive.TextureEntry textureEntry, byte[] visualParams)
129 { 127 {
130// DEBUG ON 128// m_log.WarnFormat("[AVATAR APPEARANCE] create initialized appearance for {0}",avatarID);
131 m_log.WarnFormat("[AVATAR APPEARANCE] create initialized appearance for {0}",avatarID); 129
132// DEBUG OFF
133 m_serial = 1; 130 m_serial = 1;
134 m_owner = avatarID; 131 m_owner = avatarID;
135 132
@@ -155,9 +152,8 @@ namespace OpenSim.Framework
155 152
156 public AvatarAppearance(AvatarAppearance appearance) 153 public AvatarAppearance(AvatarAppearance appearance)
157 { 154 {
158// DEBUG ON 155// m_log.WarnFormat("[AVATAR APPEARANCE] create from an existing appearance");
159 m_log.WarnFormat("[AVATAR APPEARANCE] create from an existing appearance"); 156
160// DEBUG OFF
161 if (appearance == null) 157 if (appearance == null)
162 { 158 {
163 m_serial = 1; 159 m_serial = 1;
@@ -251,10 +247,9 @@ namespace OpenSim.Framework
251 } 247 }
252 248
253 changed = true; 249 changed = true;
254// DEBUG ON 250
255 if (newface != null) 251// if (newface != null)
256 m_log.WarnFormat("[AVATAR APPEARANCE] index {0}, new texture id {1}",i,newface.TextureID); 252// m_log.WarnFormat("[AVATAR APPEARANCE]: index {0}, new texture id {1}",i,newface.TextureID);
257// DEBUG OFF
258 } 253 }
259 254
260 m_texture = textureEntry; 255 m_texture = textureEntry;
@@ -519,7 +514,7 @@ namespace OpenSim.Framework
519 } 514 }
520 else 515 else
521 { 516 {
522 m_log.Warn("[AVATARAPPEARANCE] failed to unpack wearables"); 517 m_log.Warn("[AVATAR APPEARANCE]: failed to unpack wearables");
523 } 518 }
524 519
525 // Avatar Textures 520 // Avatar Textures
@@ -537,7 +532,7 @@ namespace OpenSim.Framework
537 } 532 }
538 else 533 else
539 { 534 {
540 m_log.Warn("[AVATARAPPEARANCE] failed to unpack textures"); 535 m_log.Warn("[AVATAR APPEARANCE]: failed to unpack textures");
541 } 536 }
542 537
543 // Visual Parameters 538 // Visual Parameters
@@ -549,7 +544,7 @@ namespace OpenSim.Framework
549 } 544 }
550 else 545 else
551 { 546 {
552 m_log.Warn("[AVATARAPPEARANCE] failed to unpack visual parameters"); 547 m_log.Warn("[AVATAR APPEARANCE]: failed to unpack visual parameters");
553 } 548 }
554 549
555 // Attachments 550 // Attachments
@@ -563,7 +558,7 @@ namespace OpenSim.Framework
563 } 558 }
564 catch (Exception e) 559 catch (Exception e)
565 { 560 {
566 m_log.ErrorFormat("[AVATARAPPEARANCE] unpack failed badly: {0}",e.Message); 561 m_log.ErrorFormat("[AVATAR APPEARANCE]: unpack failed badly: {0}{1}", e.Message, e.StackTrace);
567 } 562 }
568 } 563 }
569 564
diff --git a/OpenSim/Framework/Capabilities/Caps.cs b/OpenSim/Framework/Capabilities/Caps.cs
index 872de9a..7b0e053 100644
--- a/OpenSim/Framework/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Capabilities/Caps.cs
@@ -988,9 +988,7 @@ namespace OpenSim.Framework.Capabilities
988 988
989 public void BakedTextureUploaded(UUID assetID, byte[] data) 989 public void BakedTextureUploaded(UUID assetID, byte[] data)
990 { 990 {
991// DEBUG ON 991// m_log.WarnFormat("[CAPS]: Received baked texture {0}", assetID.ToString());
992 m_log.WarnFormat("[CAPS]: Received baked texture {0}", assetID.ToString());
993// DEBUG OFF
994 AssetBase asset; 992 AssetBase asset;
995 asset = new AssetBase(assetID, "Baked Texture", (sbyte)AssetType.Texture, m_agentID.ToString()); 993 asset = new AssetBase(assetID, "Baked Texture", (sbyte)AssetType.Texture, m_agentID.ToString());
996 asset.Data = data; 994 asset.Data = data;
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
index cb298fd..161e8c2 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
@@ -615,8 +615,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
615 615
616 // UseCircuitCode handling 616 // UseCircuitCode handling
617 if (packet.Type == PacketType.UseCircuitCode) 617 if (packet.Type == PacketType.UseCircuitCode)
618 { 618 {
619 m_log.Debug("[LLUDPSERVER]: Handling UseCircuitCode packet from " + buffer.RemoteEndPoint);
620 object[] array = new object[] { buffer, packet }; 619 object[] array = new object[] { buffer, packet };
621 620
622 if (m_asyncPacketHandling) 621 if (m_asyncPacketHandling)
@@ -827,9 +826,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
827 826
828 private void HandleUseCircuitCode(object o) 827 private void HandleUseCircuitCode(object o)
829 { 828 {
829 DateTime startTime = DateTime.Now;
830 object[] array = (object[])o; 830 object[] array = (object[])o;
831 UDPPacketBuffer buffer = (UDPPacketBuffer)array[0]; 831 UDPPacketBuffer buffer = (UDPPacketBuffer)array[0];
832 UseCircuitCodePacket packet = (UseCircuitCodePacket)array[1]; 832 UseCircuitCodePacket packet = (UseCircuitCodePacket)array[1];
833
834 m_log.DebugFormat("[LLUDPSERVER]: Handling UseCircuitCode request from {0}", buffer.RemoteEndPoint);
833 835
834 IPEndPoint remoteEndPoint = (IPEndPoint)buffer.RemoteEndPoint; 836 IPEndPoint remoteEndPoint = (IPEndPoint)buffer.RemoteEndPoint;
835 837
@@ -838,6 +840,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
838 840
839 // Acknowledge the UseCircuitCode packet 841 // Acknowledge the UseCircuitCode packet
840 SendAckImmediate(remoteEndPoint, packet.Header.Sequence); 842 SendAckImmediate(remoteEndPoint, packet.Header.Sequence);
843
844 m_log.DebugFormat(
845 "[LLUDPSERVER]: Handling UseCircuitCode request from {0} took {1}ms",
846 buffer.RemoteEndPoint, (DateTime.Now - startTime).Milliseconds);
841 } 847 }
842 848
843 private void SendAckImmediate(IPEndPoint remoteEndpoint, uint sequenceNumber) 849 private void SendAckImmediate(IPEndPoint remoteEndpoint, uint sequenceNumber)
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
index 4d27ea4..6cbd8bd 100644
--- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
@@ -117,7 +117,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
117 ScenePresence sp = m_scene.GetScenePresence(client.AgentId); 117 ScenePresence sp = m_scene.GetScenePresence(client.AgentId);
118 if (sp == null) 118 if (sp == null)
119 { 119 {
120 m_log.WarnFormat("[AVFACTORY] SetAppearance unable to find presence for {0}",client.AgentId); 120 m_log.WarnFormat("[AVATAR FACTORY MODULE]: SetAppearance unable to find presence for {0}", client.AgentId);
121 return false; 121 return false;
122 } 122 }
123 123
@@ -147,14 +147,12 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
147 /// <param name="visualParam"></param> 147 /// <param name="visualParam"></param>
148 public void SetAppearance(IClientAPI client, Primitive.TextureEntry textureEntry, byte[] visualParams) 148 public void SetAppearance(IClientAPI client, Primitive.TextureEntry textureEntry, byte[] visualParams)
149 { 149 {
150// DEBUG ON 150// m_log.WarnFormat("[AVATAR FACTORY MODULE]: SetAppearance for {0}",client.AgentId);
151 m_log.WarnFormat("[AVFACTORY] SetAppearance for {0}",client.AgentId);
152// DEBUG OFF
153 151
154 ScenePresence sp = m_scene.GetScenePresence(client.AgentId); 152 ScenePresence sp = m_scene.GetScenePresence(client.AgentId);
155 if (sp == null) 153 if (sp == null)
156 { 154 {
157 m_log.WarnFormat("[AVFACTORY] SetAppearance unable to find presence for {0}",client.AgentId); 155 m_log.WarnFormat("[AVATAR FACTORY MODULE]: SetAppearance unable to find presence for {0}",client.AgentId);
158 return; 156 return;
159 } 157 }
160 158
@@ -212,8 +210,8 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
212 { 210 {
213 if (m_scene.AssetService.Get(textureID.ToString()) == null) 211 if (m_scene.AssetService.Get(textureID.ToString()) == null)
214 { 212 {
215 m_log.WarnFormat("[AVFACTORY]: Missing baked texture {0} ({1}) for avatar {2}", 213 m_log.WarnFormat("[AVATAR FACTORY MODULE]: Missing baked texture {0} ({1}) for avatar {2}",
216 textureID,idx,client.Name); 214 textureID, idx, client.Name);
217 return false; 215 return false;
218 } 216 }
219 return true; 217 return true;
@@ -223,9 +221,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
223 221
224 public void QueueAppearanceSend(UUID agentid) 222 public void QueueAppearanceSend(UUID agentid)
225 { 223 {
226// DEBUG ON 224// m_log.WarnFormat("[AVATAR FACTORY MODULE]: Queue appearance send for {0}",agentid);
227 m_log.WarnFormat("[AVFACTORY] Queue appearance send for {0}",agentid);
228// DEBUG OFF
229 225
230 // 100 nanoseconds (ticks) we should wait 226 // 100 nanoseconds (ticks) we should wait
231 long timestamp = DateTime.Now.Ticks + Convert.ToInt64(m_sendtime * 10000000); 227 long timestamp = DateTime.Now.Ticks + Convert.ToInt64(m_sendtime * 10000000);
@@ -238,9 +234,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
238 234
239 public void QueueAppearanceSave(UUID agentid) 235 public void QueueAppearanceSave(UUID agentid)
240 { 236 {
241// DEBUG ON 237// m_log.WarnFormat("[AVATAR FACTORY MODULE]: Queue appearance save for {0}",agentid);
242 m_log.WarnFormat("[AVFACTORY] Queue appearance save for {0}",agentid);
243// DEBUG OFF
244 238
245 // 100 nanoseconds (ticks) we should wait 239 // 100 nanoseconds (ticks) we should wait
246 long timestamp = DateTime.Now.Ticks + Convert.ToInt64(m_savetime * 10000000); 240 long timestamp = DateTime.Now.Ticks + Convert.ToInt64(m_savetime * 10000000);
@@ -256,13 +250,11 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
256 ScenePresence sp = m_scene.GetScenePresence(agentid); 250 ScenePresence sp = m_scene.GetScenePresence(agentid);
257 if (sp == null) 251 if (sp == null)
258 { 252 {
259 m_log.WarnFormat("[AVFACTORY] Agent {0} no longer in the scene",agentid); 253 m_log.WarnFormat("[AVATAR FACTORY MODULE]: Agent {0} no longer in the scene", agentid);
260 return; 254 return;
261 } 255 }
262 256
263// DEBUG ON 257// m_log.WarnFormat("[AVATAR FACTORY MODULE]: Handle appearance send for {0}", agentid);
264 m_log.WarnFormat("[AVFACTORY] Handle appearance send for {0}",agentid);
265// DEBUG OFF
266 258
267 // Send the appearance to everyone in the scene 259 // Send the appearance to everyone in the scene
268 sp.SendAppearanceToAllOtherAgents(); 260 sp.SendAppearanceToAllOtherAgents();
@@ -288,7 +280,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
288 ScenePresence sp = m_scene.GetScenePresence(agentid); 280 ScenePresence sp = m_scene.GetScenePresence(agentid);
289 if (sp == null) 281 if (sp == null)
290 { 282 {
291 m_log.WarnFormat("[AVFACTORY] Agent {0} no longer in the scene",agentid); 283 m_log.WarnFormat("[AVATAR FACTORY MODULE]: Agent {0} no longer in the scene", agentid);
292 return; 284 return;
293 } 285 }
294 286
@@ -339,13 +331,12 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
339 ScenePresence sp = m_scene.GetScenePresence(client.AgentId); 331 ScenePresence sp = m_scene.GetScenePresence(client.AgentId);
340 if (sp == null) 332 if (sp == null)
341 { 333 {
342 m_log.WarnFormat("[AVFACTORY] SendWearables unable to find presence for {0}",client.AgentId); 334 m_log.WarnFormat("[AVATAR FACTORY MODULE]: SendWearables unable to find presence for {0}", client.AgentId);
343 return; 335 return;
344 } 336 }
345 337
346// DEBUG ON 338// m_log.WarnFormat("[AVATAR FACTORY MODULE]: Received request for wearables of {0}", client.AgentId);
347 m_log.WarnFormat("[AVFACTORY]: Received request for wearables of {0}", client.AgentId); 339
348// DEBUG OFF
349 client.SendWearables(sp.Appearance.Wearables,sp.Appearance.Serial++); 340 client.SendWearables(sp.Appearance.Wearables,sp.Appearance.Serial++);
350 } 341 }
351 342
@@ -359,13 +350,11 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
359 ScenePresence sp = m_scene.GetScenePresence(client.AgentId); 350 ScenePresence sp = m_scene.GetScenePresence(client.AgentId);
360 if (sp == null) 351 if (sp == null)
361 { 352 {
362 m_log.WarnFormat("[AVFACTORY] AvatarIsWearing unable to find presence for {0}",client.AgentId); 353 m_log.WarnFormat("[AVATAR FACTORY MODULE]: AvatarIsWearing unable to find presence for {0}", client.AgentId);
363 return; 354 return;
364 } 355 }
365 356
366// DEBUG ON 357// m_log.WarnFormat("[AVATAR FACTORY MODULE]: AvatarIsWearing called for {0}",client.AgentId);
367 m_log.WarnFormat("[AVFACTORY]: AvatarIsWearing called for {0}",client.AgentId);
368// DEBUG OFF
369 358
370 AvatarAppearance avatAppearance = new AvatarAppearance(sp.Appearance); 359 AvatarAppearance avatAppearance = new AvatarAppearance(sp.Appearance);
371 360
@@ -405,7 +394,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
405 else 394 else
406 { 395 {
407 m_log.ErrorFormat( 396 m_log.ErrorFormat(
408 "[AVFACTORY]: Can't find inventory item {0} for {1}, setting to default", 397 "[AVATAR FACTORY MODULE]: Can't find inventory item {0} for {1}, setting to default",
409 appearance.Wearables[i][j].ItemID, (WearableType)i); 398 appearance.Wearables[i][j].ItemID, (WearableType)i);
410 399
411 appearance.Wearables[i].RemoveItem(appearance.Wearables[i][j].ItemID); 400 appearance.Wearables[i].RemoveItem(appearance.Wearables[i][j].ItemID);
@@ -415,7 +404,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
415 } 404 }
416 else 405 else
417 { 406 {
418 m_log.WarnFormat("[AVFACTORY]: user {0} has no inventory, appearance isn't going to work", userID); 407 m_log.WarnFormat("[AVATAR FACTORY MODULE]: user {0} has no inventory, appearance isn't going to work", userID);
419 } 408 }
420 } 409 }
421 } 410 }
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 38fff1c..485e05a 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -193,10 +193,11 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
193 GridRegion finalDestination = GetFinalDestination(reg); 193 GridRegion finalDestination = GetFinalDestination(reg);
194 if (finalDestination == null) 194 if (finalDestination == null)
195 { 195 {
196 m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Final destination is having problems. Unable to teleport agent."); 196 m_log.WarnFormat("[ENTITY TRANSFER MODULE]: Final destination is having problems. Unable to teleport agent.");
197 sp.ControllingClient.SendTeleportFailed("Problem at destination"); 197 sp.ControllingClient.SendTeleportFailed("Problem at destination");
198 return; 198 return;
199 } 199 }
200
200 m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Final destination is x={0} y={1} uuid={2}", 201 m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Final destination is x={0} y={1} uuid={2}",
201 finalDestination.RegionLocX / Constants.RegionSize, finalDestination.RegionLocY / Constants.RegionSize, finalDestination.RegionID); 202 finalDestination.RegionLocX / Constants.RegionSize, finalDestination.RegionLocY / Constants.RegionSize, finalDestination.RegionID);
202 203
@@ -240,7 +241,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
240 } 241 }
241 catch (Exception e) 242 catch (Exception e)
242 { 243 {
243 m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Exception on teleport: {0}\n{1}", e.Message, e.StackTrace); 244 m_log.WarnFormat("[ENTITY TRANSFER MODULE]: Exception on teleport: {0}\n{1}", e.Message, e.StackTrace);
244 sp.ControllingClient.SendTeleportFailed("Internal error"); 245 sp.ControllingClient.SendTeleportFailed("Internal error");
245 } 246 }
246 } 247 }
@@ -421,7 +422,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
421 m_log.DebugFormat( 422 m_log.DebugFormat(
422 "[ENTITY TRANSFER MODULE]: Sending new CAPS seed url {0} to client {1}", capsPath, sp.UUID); 423 "[ENTITY TRANSFER MODULE]: Sending new CAPS seed url {0} to client {1}", capsPath, sp.UUID);
423 424
424
425 if (eq != null) 425 if (eq != null)
426 { 426 {
427 eq.TeleportFinishEvent(destinationHandle, 13, endPoint, 427 eq.TeleportFinishEvent(destinationHandle, 13, endPoint,
@@ -581,6 +581,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
581 client.SendTeleportFailed("Your home region could not be found."); 581 client.SendTeleportFailed("Your home region could not be found.");
582 return; 582 return;
583 } 583 }
584
584 m_log.DebugFormat("[ENTITY TRANSFER MODULE]: User's home region is {0} {1} ({2}-{3})", 585 m_log.DebugFormat("[ENTITY TRANSFER MODULE]: User's home region is {0} {1} ({2}-{3})",
585 regionInfo.RegionName, regionInfo.RegionID, regionInfo.RegionLocX / Constants.RegionSize, regionInfo.RegionLocY / Constants.RegionSize); 586 regionInfo.RegionName, regionInfo.RegionID, regionInfo.RegionLocX / Constants.RegionSize, regionInfo.RegionLocY / Constants.RegionSize);
586 587
@@ -1188,7 +1189,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
1188 Utils.LongToUInts(reg.RegionHandle, out x, out y); 1189 Utils.LongToUInts(reg.RegionHandle, out x, out y);
1189 x = x / Constants.RegionSize; 1190 x = x / Constants.RegionSize;
1190 y = y / Constants.RegionSize; 1191 y = y / Constants.RegionSize;
1191 m_log.Info("[ENTITY TRANSFER MODULE]: Starting to inform client about neighbour " + x + ", " + y + "(" + endPoint.ToString() + ")"); 1192 m_log.Debug("[ENTITY TRANSFER MODULE]: Starting to inform client about neighbour " + x + ", " + y + "(" + endPoint.ToString() + ")");
1192 1193
1193 string capsPath = "http://" + reg.ExternalHostName + ":" + reg.HttpPort 1194 string capsPath = "http://" + reg.ExternalHostName + ":" + reg.HttpPort
1194 + "/CAPS/" + a.CapsPath + "0000/"; 1195 + "/CAPS/" + a.CapsPath + "0000/";
@@ -1224,7 +1225,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
1224 // TODO: make Event Queue disablable! 1225 // TODO: make Event Queue disablable!
1225 } 1226 }
1226 1227
1227 m_log.Info("[ENTITY TRANSFER MODULE]: Completed inform client about neighbour " + endPoint.ToString()); 1228 m_log.Debug("[ENTITY TRANSFER MODULE]: Completed inform client about neighbour " + endPoint.ToString());
1228 1229
1229 } 1230 }
1230 1231
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/ActivityDetector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/ActivityDetector.cs
index a64f785..6543845 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/ActivityDetector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/ActivityDetector.cs
@@ -1,4 +1,4 @@
1/* 1/*
2 * Copyright (c) Contributors, http://opensimulator.org/ 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * 4 *
@@ -65,7 +65,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.GridUser
65 65
66 public void OnMakeRootAgent(ScenePresence sp) 66 public void OnMakeRootAgent(ScenePresence sp)
67 { 67 {
68 m_log.DebugFormat("[ACTIVITY DETECTOR]: Detected root presence {0} in {1}", sp.UUID, sp.Scene.RegionInfo.RegionName); 68// m_log.DebugFormat("[ACTIVITY DETECTOR]: Detected root presence {0} in {1}", sp.UUID, sp.Scene.RegionInfo.RegionName);
69 m_GridUserService.SetLastPosition(sp.UUID.ToString(), UUID.Zero, sp.Scene.RegionInfo.RegionID, sp.AbsolutePosition, sp.Lookat); 69 m_GridUserService.SetLastPosition(sp.UUID.ToString(), UUID.Zero, sp.Scene.RegionInfo.RegionID, sp.AbsolutePosition, sp.Lookat);
70 } 70 }
71 71
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/PresenceDetector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/PresenceDetector.cs
index 62b8278..fa5b873 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/PresenceDetector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/PresenceDetector.cs
@@ -1,4 +1,4 @@
1/* 1/*
2 * Copyright (c) Contributors, http://opensimulator.org/ 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * 4 *
@@ -71,7 +71,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence
71 71
72 public void OnMakeRootAgent(ScenePresence sp) 72 public void OnMakeRootAgent(ScenePresence sp)
73 { 73 {
74 m_log.DebugFormat("[PRESENCE DETECTOR]: Detected root presence {0} in {1}", sp.UUID, sp.Scene.RegionInfo.RegionName); 74// m_log.DebugFormat("[PRESENCE DETECTOR]: Detected root presence {0} in {1}", sp.UUID, sp.Scene.RegionInfo.RegionName);
75 m_PresenceService.ReportAgent(sp.ControllingClient.SessionId, sp.Scene.RegionInfo.RegionID); 75 m_PresenceService.ReportAgent(sp.ControllingClient.SessionId, sp.Scene.RegionInfo.RegionID);
76 } 76 }
77 77
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
index a182eea..3e478b0 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -324,7 +324,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
324 if (threadrunning) return; 324 if (threadrunning) return;
325 threadrunning = true; 325 threadrunning = true;
326 326
327 m_log.Debug("[WORLD MAP]: Starting remote MapItem request thread"); 327// m_log.Debug("[WORLD MAP]: Starting remote MapItem request thread");
328 328
329 Watchdog.StartThread(process, "MapItemRequestThread", ThreadPriority.BelowNormal, true); 329 Watchdog.StartThread(process, "MapItemRequestThread", ThreadPriority.BelowNormal, true);
330 } 330 }
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 9402f8b..52e7462 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1075,9 +1075,11 @@ namespace OpenSim.Region.Framework.Scenes
1075 /// </summary> 1075 /// </summary>
1076 public void CompleteMovement(IClientAPI client) 1076 public void CompleteMovement(IClientAPI client)
1077 { 1077 {
1078// DEBUG ON 1078 DateTime startTime = DateTime.Now;
1079 m_log.WarnFormat("[SCENE PRESENCE]: CompleteMovement for {0}",UUID); 1079
1080// DEBUG OFF 1080 m_log.DebugFormat(
1081 "[SCENE PRESENCE]: Completing movement of {0} into region {1}",
1082 client.Name, Scene.RegionInfo.RegionName);
1081 1083
1082 Vector3 look = Velocity; 1084 Vector3 look = Velocity;
1083 if ((look.X == 0) && (look.Y == 0) && (look.Z == 0)) 1085 if ((look.X == 0) && (look.Y == 0) && (look.Z == 0))
@@ -1125,6 +1127,10 @@ namespace OpenSim.Region.Framework.Scenes
1125 if (friendsModule != null) 1127 if (friendsModule != null)
1126 friendsModule.SendFriendsOnlineIfNeeded(ControllingClient); 1128 friendsModule.SendFriendsOnlineIfNeeded(ControllingClient);
1127 } 1129 }
1130
1131 m_log.DebugFormat(
1132 "[SCENE PRESENCE]: Completing movement of {0} into region {1} took {2}ms",
1133 client.Name, Scene.RegionInfo.RegionName, (DateTime.Now - startTime).Milliseconds);
1128 } 1134 }
1129 1135
1130 /// <summary> 1136 /// <summary>
@@ -2378,7 +2384,7 @@ namespace OpenSim.Region.Framework.Scenes
2378 if (remoteAvatar == null) 2384 if (remoteAvatar == null)
2379 return; 2385 return;
2380 2386
2381 IClientAPI cl=remoteAvatar.ControllingClient; 2387 IClientAPI cl = remoteAvatar.ControllingClient;
2382 if (cl == null) 2388 if (cl == null)
2383 return; 2389 return;
2384 2390
@@ -2387,13 +2393,13 @@ namespace OpenSim.Region.Framework.Scenes
2387 2393
2388 if (LocalId == remoteAvatar.LocalId) 2394 if (LocalId == remoteAvatar.LocalId)
2389 { 2395 {
2390 m_log.WarnFormat("[SP] An agent is attempting to send data to itself; {0}",UUID); 2396 m_log.WarnFormat("[SCENEPRESENCE]: An agent is attempting to send avatar data to itself; {0}", UUID);
2391 return; 2397 return;
2392 } 2398 }
2393 2399
2394 if (IsChildAgent) 2400 if (IsChildAgent)
2395 { 2401 {
2396 m_log.WarnFormat("[SCENEPRESENCE] A child agent is attempting to send out avatar data"); 2402 m_log.WarnFormat("[SCENEPRESENCE]: A child agent is attempting to send out avatar data; {0}", UUID);
2397 return; 2403 return;
2398 } 2404 }
2399 2405
@@ -2476,14 +2482,14 @@ namespace OpenSim.Region.Framework.Scenes
2476 { 2482 {
2477 if (m_scene.AvatarFactory.ValidateBakedTextureCache(m_controllingClient)) 2483 if (m_scene.AvatarFactory.ValidateBakedTextureCache(m_controllingClient))
2478 { 2484 {
2479 m_log.WarnFormat("[SP] baked textures are in the ache for {0}",Name); 2485// m_log.WarnFormat("[SCENEPRESENCE]: baked textures are in the cache for {0}", Name);
2480 m_controllingClient.SendAppearance( 2486 m_controllingClient.SendAppearance(
2481 m_appearance.Owner,m_appearance.VisualParams,m_appearance.Texture.GetBytes()); 2487 m_appearance.Owner,m_appearance.VisualParams,m_appearance.Texture.GetBytes());
2482 } 2488 }
2483 } 2489 }
2484 else 2490 else
2485 { 2491 {
2486 m_log.WarnFormat("[SP] AvatarFactory not set"); 2492 m_log.WarnFormat("[SCENEPRESENCE]: AvatarFactory not set for {0}", Name);
2487 } 2493 }
2488 2494
2489 SendInitialFullUpdateToAllClients(); 2495 SendInitialFullUpdateToAllClients();
@@ -2495,7 +2501,7 @@ namespace OpenSim.Region.Framework.Scenes
2495 public void SendAppearanceToAllOtherAgents() 2501 public void SendAppearanceToAllOtherAgents()
2496 { 2502 {
2497// DEBUG ON 2503// DEBUG ON
2498 m_log.WarnFormat("[SP] Send appearance from {0} to all other agents",m_uuid); 2504// m_log.WarnFormat("[SCENEPRESENCE]: Send appearance from {0} to all other agents", m_uuid);
2499// DEBUG OFF 2505// DEBUG OFF
2500 m_perfMonMS = Util.EnvironmentTickCount(); 2506 m_perfMonMS = Util.EnvironmentTickCount();
2501 2507
@@ -2518,7 +2524,7 @@ namespace OpenSim.Region.Framework.Scenes
2518 { 2524 {
2519 if (LocalId == avatar.LocalId) 2525 if (LocalId == avatar.LocalId)
2520 { 2526 {
2521 m_log.WarnFormat("[SP] An agent is attempting to send data to itself; {0}",UUID); 2527 m_log.WarnFormat("[SCENE PRESENCE]: An agent is attempting to send appearance data to itself; {0}", UUID);
2522 return; 2528 return;
2523 } 2529 }
2524 2530
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
index a5f748f..502fc82 100644
--- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
@@ -1,4 +1,4 @@
1/* 1/*
2 * Copyright (c) Contributors, http://opensimulator.org/ 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * 4 *
@@ -117,7 +117,7 @@ namespace OpenSim.Services.Connectors.Simulation
117 } 117 }
118 catch (Exception e) 118 catch (Exception e)
119 { 119 {
120 m_log.Debug("[REMOTE SIMULATION CONNECTOR]: Unable to resolve external endpoint on agent create. Reason: " + e.Message); 120 m_log.Error("[REMOTE SIMULATION CONNECTOR]: Unable to resolve external endpoint on agent create. Reason: " + e.Message);
121 reason = e.Message; 121 reason = e.Message;
122 return false; 122 return false;
123 } 123 }
@@ -158,13 +158,13 @@ namespace OpenSim.Services.Connectors.Simulation
158 AgentCreateRequest.ContentLength = buffer.Length; //Count bytes to send 158 AgentCreateRequest.ContentLength = buffer.Length; //Count bytes to send
159 os = AgentCreateRequest.GetRequestStream(); 159 os = AgentCreateRequest.GetRequestStream();
160 os.Write(buffer, 0, strBuffer.Length); //Send it 160 os.Write(buffer, 0, strBuffer.Length); //Send it
161 m_log.InfoFormat("[REMOTE SIMULATION CONNECTOR]: Posted CreateAgent request to remote sim {0}, region {1}, x={2} y={3}", 161 m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: Posted CreateAgent request to remote sim {0}, region {1}, x={2} y={3}",
162 uri, destination.RegionName, destination.RegionLocX, destination.RegionLocY); 162 uri, destination.RegionName, destination.RegionLocX, destination.RegionLocY);
163 } 163 }
164 //catch (WebException ex) 164 //catch (WebException ex)
165 catch 165 catch
166 { 166 {
167 //m_log.InfoFormat("[REMOTE SIMULATION CONNECTOR]: Bad send on ChildAgentUpdate {0}", ex.Message); 167 //m_log.ErrorFormat("[REMOTE SIMULATION CONNECTOR]: Bad send on ChildAgentUpdate {0}", ex.Message);
168 reason = "cannot contact remote region"; 168 reason = "cannot contact remote region";
169 return false; 169 return false;
170 } 170 }
@@ -191,19 +191,19 @@ namespace OpenSim.Services.Connectors.Simulation
191 webResponse = AgentCreateRequest.GetResponse(); 191 webResponse = AgentCreateRequest.GetResponse();
192 if (webResponse == null) 192 if (webResponse == null)
193 { 193 {
194 m_log.Info("[REMOTE SIMULATION CONNECTOR]: Null reply on DoCreateChildAgentCall post"); 194 m_log.Debug("[REMOTE SIMULATION CONNECTOR]: Null reply on DoCreateChildAgentCall post");
195 } 195 }
196 else 196 else
197 { 197 {
198 198
199 sr = new StreamReader(webResponse.GetResponseStream()); 199 sr = new StreamReader(webResponse.GetResponseStream());
200 response = sr.ReadToEnd().Trim(); 200 response = sr.ReadToEnd().Trim();
201 m_log.InfoFormat("[REMOTE SIMULATION CONNECTOR]: DoCreateChildAgentCall reply was {0} ", response); 201 m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: DoCreateChildAgentCall reply was {0} ", response);
202 } 202 }
203 } 203 }
204 catch (WebException ex) 204 catch (WebException ex)
205 { 205 {
206 m_log.InfoFormat("[REMOTE SIMULATION CONNECTOR]: exception on reply of DoCreateChildAgentCall {0}", ex.Message); 206 m_log.WarnFormat("[REMOTE SIMULATION CONNECTOR]: exception on reply of DoCreateChildAgentCall {0}", ex.Message);
207 reason = "Destination did not reply"; 207 reason = "Destination did not reply";
208 return string.Empty; 208 return string.Empty;
209 } 209 }
@@ -231,7 +231,7 @@ namespace OpenSim.Services.Connectors.Simulation
231 } 231 }
232 catch (NullReferenceException e) 232 catch (NullReferenceException e)
233 { 233 {
234 m_log.InfoFormat("[REMOTE SIMULATION CONNECTOR]: exception on reply of DoCreateChildAgentCall {0}", e.Message); 234 m_log.WarnFormat("[REMOTE SIMULATION CONNECTOR]: exception on reply of DoCreateChildAgentCall {0}", e.Message);
235 235
236 // check for old style response 236 // check for old style response
237 if (response.ToLower().StartsWith("true")) 237 if (response.ToLower().StartsWith("true"))
@@ -251,7 +251,7 @@ namespace OpenSim.Services.Connectors.Simulation
251 } 251 }
252 catch (Exception e) 252 catch (Exception e)
253 { 253 {
254 m_log.Debug("[REMOTE SIMULATION CONNECTOR]: PackAgentCircuitData failed with exception: " + e.Message); 254 m_log.Warn("[REMOTE SIMULATION CONNECTOR]: PackAgentCircuitData failed with exception: " + e.Message);
255 return null; 255 return null;
256 } 256 }
257 // Add the input arguments 257 // Add the input arguments
@@ -284,7 +284,7 @@ namespace OpenSim.Services.Connectors.Simulation
284 } 284 }
285 catch (Exception e) 285 catch (Exception e)
286 { 286 {
287 m_log.Debug("[REMOTE SIMULATION CONNECTOR]: Unable to resolve external endpoint on agent update. Reason: " + e.Message); 287 m_log.Warn("[REMOTE SIMULATION CONNECTOR]: Unable to resolve external endpoint on agent update. Reason: " + e.Message);
288 return false; 288 return false;
289 } 289 }
290 //Console.WriteLine(" >>> DoAgentUpdateCall <<< " + uri); 290 //Console.WriteLine(" >>> DoAgentUpdateCall <<< " + uri);
@@ -303,7 +303,7 @@ namespace OpenSim.Services.Connectors.Simulation
303 } 303 }
304 catch (Exception e) 304 catch (Exception e)
305 { 305 {
306 m_log.Debug("[REMOTE SIMULATION CONNECTOR]: PackUpdateMessage failed with exception: " + e.Message); 306 m_log.Warn("[REMOTE SIMULATION CONNECTOR]: PackUpdateMessage failed with exception: " + e.Message);
307 } 307 }
308 // Add the input arguments 308 // Add the input arguments
309 args["destination_x"] = OSD.FromString(destination.RegionLocX.ToString()); 309 args["destination_x"] = OSD.FromString(destination.RegionLocX.ToString());
@@ -332,12 +332,12 @@ namespace OpenSim.Services.Connectors.Simulation
332 ChildUpdateRequest.ContentLength = buffer.Length; //Count bytes to send 332 ChildUpdateRequest.ContentLength = buffer.Length; //Count bytes to send
333 os = ChildUpdateRequest.GetRequestStream(); 333 os = ChildUpdateRequest.GetRequestStream();
334 os.Write(buffer, 0, strBuffer.Length); //Send it 334 os.Write(buffer, 0, strBuffer.Length); //Send it
335 //m_log.InfoFormat("[REMOTE SIMULATION CONNECTOR]: Posted AgentUpdate request to remote sim {0}", uri); 335 //m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: Posted AgentUpdate request to remote sim {0}", uri);
336 } 336 }
337 catch (WebException ex) 337 catch (WebException ex)
338 //catch 338 //catch
339 { 339 {
340 m_log.InfoFormat("[REMOTE SIMULATION CONNECTOR]: Bad send on AgentUpdate {0}", ex.Message); 340 m_log.WarnFormat("[REMOTE SIMULATION CONNECTOR]: Bad send on AgentUpdate {0}", ex.Message);
341 341
342 return false; 342 return false;
343 } 343 }
@@ -348,7 +348,7 @@ namespace OpenSim.Services.Connectors.Simulation
348 } 348 }
349 349
350 // Let's wait for the response 350 // Let's wait for the response
351 //m_log.Info("[REMOTE SIMULATION CONNECTOR]: Waiting for a reply after ChildAgentUpdate"); 351 //m_log.Debug("[REMOTE SIMULATION CONNECTOR]: Waiting for a reply after ChildAgentUpdate");
352 352
353 WebResponse webResponse = null; 353 WebResponse webResponse = null;
354 StreamReader sr = null; 354 StreamReader sr = null;
@@ -357,19 +357,19 @@ namespace OpenSim.Services.Connectors.Simulation
357 webResponse = ChildUpdateRequest.GetResponse(); 357 webResponse = ChildUpdateRequest.GetResponse();
358 if (webResponse == null) 358 if (webResponse == null)
359 { 359 {
360 m_log.Info("[REMOTE SIMULATION CONNECTOR]: Null reply on ChilAgentUpdate post"); 360 m_log.Debug("[REMOTE SIMULATION CONNECTOR]: Null reply on ChilAgentUpdate post");
361 } 361 }
362 362
363 sr = new StreamReader(webResponse.GetResponseStream()); 363 sr = new StreamReader(webResponse.GetResponseStream());
364 //reply = sr.ReadToEnd().Trim(); 364 //reply = sr.ReadToEnd().Trim();
365 sr.ReadToEnd().Trim(); 365 sr.ReadToEnd().Trim();
366 sr.Close(); 366 sr.Close();
367 //m_log.InfoFormat("[REMOTE SIMULATION CONNECTOR]: ChilAgentUpdate reply was {0} ", reply); 367 //m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: ChilAgentUpdate reply was {0} ", reply);
368 368
369 } 369 }
370 catch (WebException ex) 370 catch (WebException ex)
371 { 371 {
372 m_log.InfoFormat("[REMOTE SIMULATION CONNECTOR]: exception on reply of ChilAgentUpdate from {0}: {1}", uri, ex.Message); 372 m_log.WarnFormat("[REMOTE SIMULATION CONNECTOR]: exception on reply of ChilAgentUpdate from {0}: {1}", uri, ex.Message);
373 // ignore, really 373 // ignore, really
374 } 374 }
375 finally 375 finally
@@ -401,7 +401,7 @@ namespace OpenSim.Services.Connectors.Simulation
401 webResponse = (HttpWebResponse)request.GetResponse(); 401 webResponse = (HttpWebResponse)request.GetResponse();
402 if (webResponse == null) 402 if (webResponse == null)
403 { 403 {
404 m_log.Info("[REMOTE SIMULATION CONNECTOR]: Null reply on agent get "); 404 m_log.Debug("[REMOTE SIMULATION CONNECTOR]: Null reply on agent get ");
405 } 405 }
406 406
407 sr = new StreamReader(webResponse.GetResponseStream()); 407 sr = new StreamReader(webResponse.GetResponseStream());
@@ -412,7 +412,7 @@ namespace OpenSim.Services.Connectors.Simulation
412 } 412 }
413 catch (WebException ex) 413 catch (WebException ex)
414 { 414 {
415 m_log.InfoFormat("[REMOTE SIMULATION CONNECTOR]: exception on reply of agent get {0}", ex.Message); 415 m_log.WarnFormat("[REMOTE SIMULATION CONNECTOR]: exception on reply of agent get {0}", ex.Message);
416 // ignore, really 416 // ignore, really
417 return false; 417 return false;
418 } 418 }
@@ -453,7 +453,7 @@ namespace OpenSim.Services.Connectors.Simulation
453 WebResponse webResponse = request.GetResponse(); 453 WebResponse webResponse = request.GetResponse();
454 if (webResponse == null) 454 if (webResponse == null)
455 { 455 {
456 m_log.Info("[REMOTE SIMULATION CONNECTOR]: Null reply on ReleaseAgent"); 456 m_log.Debug("[REMOTE SIMULATION CONNECTOR]: Null reply on ReleaseAgent");
457 } 457 }
458 458
459 sr = new StreamReader(webResponse.GetResponseStream()); 459 sr = new StreamReader(webResponse.GetResponseStream());
@@ -465,7 +465,7 @@ namespace OpenSim.Services.Connectors.Simulation
465 } 465 }
466 catch (WebException ex) 466 catch (WebException ex)
467 { 467 {
468 m_log.InfoFormat("[REMOTE SIMULATION CONNECTOR]: exception on reply of ReleaseAgent {0}", ex.Message); 468 m_log.WarnFormat("[REMOTE SIMULATION CONNECTOR]: exception on reply of ReleaseAgent {0}", ex.Message);
469 return false; 469 return false;
470 } 470 }
471 finally 471 finally
@@ -486,7 +486,7 @@ namespace OpenSim.Services.Connectors.Simulation
486 } 486 }
487 catch (Exception e) 487 catch (Exception e)
488 { 488 {
489 m_log.Debug("[REMOTE SIMULATION CONNECTOR]: Unable to resolve external endpoint on agent close. Reason: " + e.Message); 489 m_log.Warn("[REMOTE SIMULATION CONNECTOR]: Unable to resolve external endpoint on agent close. Reason: " + e.Message);
490 return false; 490 return false;
491 } 491 }
492 492
@@ -502,7 +502,7 @@ namespace OpenSim.Services.Connectors.Simulation
502 WebResponse webResponse = request.GetResponse(); 502 WebResponse webResponse = request.GetResponse();
503 if (webResponse == null) 503 if (webResponse == null)
504 { 504 {
505 m_log.Info("[REMOTE SIMULATION CONNECTOR]: Null reply on agent delete "); 505 m_log.Debug("[REMOTE SIMULATION CONNECTOR]: Null reply on agent delete ");
506 } 506 }
507 507
508 sr = new StreamReader(webResponse.GetResponseStream()); 508 sr = new StreamReader(webResponse.GetResponseStream());
@@ -514,7 +514,7 @@ namespace OpenSim.Services.Connectors.Simulation
514 } 514 }
515 catch (WebException ex) 515 catch (WebException ex)
516 { 516 {
517 m_log.InfoFormat("[REMOTE SIMULATION CONNECTOR]: exception on reply of agent delete from {0}: {1}", destination.RegionName, ex.Message); 517 m_log.WarnFormat("[REMOTE SIMULATION CONNECTOR]: exception on reply of agent delete from {0}: {1}", destination.RegionName, ex.Message);
518 return false; 518 return false;
519 } 519 }
520 finally 520 finally
@@ -579,11 +579,11 @@ namespace OpenSim.Services.Connectors.Simulation
579 ObjectCreateRequest.ContentLength = buffer.Length; //Count bytes to send 579 ObjectCreateRequest.ContentLength = buffer.Length; //Count bytes to send
580 os = ObjectCreateRequest.GetRequestStream(); 580 os = ObjectCreateRequest.GetRequestStream();
581 os.Write(buffer, 0, strBuffer.Length); //Send it 581 os.Write(buffer, 0, strBuffer.Length); //Send it
582 m_log.InfoFormat("[REMOTE SIMULATION CONNECTOR]: Posted CreateObject request to remote sim {0}", uri); 582 m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: Posted CreateObject request to remote sim {0}", uri);
583 } 583 }
584 catch (WebException ex) 584 catch (WebException ex)
585 { 585 {
586 m_log.InfoFormat("[REMOTE SIMULATION CONNECTOR]: Bad send on CreateObject {0}", ex.Message); 586 m_log.WarnFormat("[REMOTE SIMULATION CONNECTOR]: Bad send on CreateObject {0}", ex.Message);
587 return false; 587 return false;
588 } 588 }
589 finally 589 finally
@@ -601,7 +601,7 @@ namespace OpenSim.Services.Connectors.Simulation
601 WebResponse webResponse = ObjectCreateRequest.GetResponse(); 601 WebResponse webResponse = ObjectCreateRequest.GetResponse();
602 if (webResponse == null) 602 if (webResponse == null)
603 { 603 {
604 m_log.Info("[REMOTE SIMULATION CONNECTOR]: Null reply on CreateObject post"); 604 m_log.Warn("[REMOTE SIMULATION CONNECTOR]: Null reply on CreateObject post");
605 return false; 605 return false;
606 } 606 }
607 607
@@ -613,7 +613,7 @@ namespace OpenSim.Services.Connectors.Simulation
613 } 613 }
614 catch (WebException ex) 614 catch (WebException ex)
615 { 615 {
616 m_log.InfoFormat("[REMOTE SIMULATION CONNECTOR]: exception on reply of CreateObject {0}", ex.Message); 616 m_log.WarnFormat("[REMOTE SIMULATION CONNECTOR]: exception on reply of CreateObject {0}", ex.Message);
617 return false; 617 return false;
618 } 618 }
619 finally 619 finally
diff --git a/OpenSim/Services/PresenceService/PresenceService.cs b/OpenSim/Services/PresenceService/PresenceService.cs
index 976153f..09c31c3 100644
--- a/OpenSim/Services/PresenceService/PresenceService.cs
+++ b/OpenSim/Services/PresenceService/PresenceService.cs
@@ -88,7 +88,7 @@ namespace OpenSim.Services.PresenceService
88 88
89 public bool ReportAgent(UUID sessionID, UUID regionID) 89 public bool ReportAgent(UUID sessionID, UUID regionID)
90 { 90 {
91 m_log.DebugFormat("[PRESENCE SERVICE]: ReportAgent with session {0} in region {1}", sessionID, regionID); 91// m_log.DebugFormat("[PRESENCE SERVICE]: ReportAgent with session {0} in region {1}", sessionID, regionID);
92 try 92 try
93 { 93 {
94 PresenceData pdata = m_Database.Get(sessionID); 94 PresenceData pdata = m_Database.Get(sessionID);
generated by cgit v1.1 at 2024-07-03 07:50:53 +0000