aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authoropensim mirror account2010-10-29 16:00:05 -0700
committeropensim mirror account2010-10-29 16:00:05 -0700
commitae12bcc43ccded85987dd6f9beb54ca54eb0132e (patch)
tree10abc78e310d1fd8bd0f4d0185733114ded9f77a
parentMerge branch 'master' of /var/git/opensim/ (diff)
parenttweak a few more scene presence logging messages for consistency (diff)
downloadopensim-SC_OLD-ae12bcc43ccded85987dd6f9beb54ca54eb0132e.zip
opensim-SC_OLD-ae12bcc43ccded85987dd6f9beb54ca54eb0132e.tar.gz
opensim-SC_OLD-ae12bcc43ccded85987dd6f9beb54ca54eb0132e.tar.bz2
opensim-SC_OLD-ae12bcc43ccded85987dd6f9beb54ca54eb0132e.tar.xz
Merge branch 'master' of /var/git/opensim/
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 29cf0e5..52e7462 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2384,7 +2384,7 @@ namespace OpenSim.Region.Framework.Scenes
2384 if (remoteAvatar == null) 2384 if (remoteAvatar == null)
2385 return; 2385 return;
2386 2386
2387 IClientAPI cl=remoteAvatar.ControllingClient; 2387 IClientAPI cl = remoteAvatar.ControllingClient;
2388 if (cl == null) 2388 if (cl == null)
2389 return; 2389 return;
2390 2390
@@ -2393,7 +2393,7 @@ namespace OpenSim.Region.Framework.Scenes
2393 2393
2394 if (LocalId == remoteAvatar.LocalId) 2394 if (LocalId == remoteAvatar.LocalId)
2395 { 2395 {
2396 m_log.WarnFormat("[SCENEPRESENCE]: 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);
2397 return; 2397 return;
2398 } 2398 }
2399 2399
@@ -2524,7 +2524,7 @@ namespace OpenSim.Region.Framework.Scenes
2524 { 2524 {
2525 if (LocalId == avatar.LocalId) 2525 if (LocalId == avatar.LocalId)
2526 { 2526 {
2527 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);
2528 return; 2528 return;
2529 } 2529 }
2530 2530