aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-11-07 21:25:47 +0000
committerJustin Clarke Casey2008-11-07 21:25:47 +0000
commita943b7dc7d42a915fb5adbf0f6e4136e99c5dac2 (patch)
tree8a529bb42a593be2f7100e8eefb218ec433700b1 /OpenSim
parent* Stop requiring local ids in the SOG constructors. (diff)
downloadopensim-SC-a943b7dc7d42a915fb5adbf0f6e4136e99c5dac2.zip
opensim-SC-a943b7dc7d42a915fb5adbf0f6e4136e99c5dac2.tar.gz
opensim-SC-a943b7dc7d42a915fb5adbf0f6e4136e99c5dac2.tar.bz2
opensim-SC-a943b7dc7d42a915fb5adbf0f6e4136e99c5dac2.tar.xz
* minor: Just some tidy up of log messages, etc.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs18
1 files changed, 5 insertions, 13 deletions
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index beca44c..4adebc4 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -1172,6 +1172,7 @@ namespace OpenSim.Region.Environment.Scenes
1172 //m_scene.DeleteSceneObject(proxyObjectGroup); 1172 //m_scene.DeleteSceneObject(proxyObjectGroup);
1173 //} 1173 //}
1174 } 1174 }
1175
1175 m_autoPilotTarget = Vector3.Zero; 1176 m_autoPilotTarget = Vector3.Zero;
1176 m_autopilotMoving = false; 1177 m_autopilotMoving = false;
1177 } 1178 }
@@ -2077,13 +2078,9 @@ namespace OpenSim.Region.Environment.Scenes
2077 2078
2078 //m_log.Info("[NeighborThrottle]: " + m_scene.GetInaccurateNeighborCount().ToString() + " - m: " + multiplier.ToString()); 2079 //m_log.Info("[NeighborThrottle]: " + m_scene.GetInaccurateNeighborCount().ToString() + " - m: " + multiplier.ToString());
2079 cadu.throttles = ControllingClient.GetThrottlesPacked(multiplier); 2080 cadu.throttles = ControllingClient.GetThrottlesPacked(multiplier);
2080
2081
2082
2083
2084
2085 cadu.Velocity = new sLLVector3(Velocity); 2081 cadu.Velocity = new sLLVector3(Velocity);
2086 m_scene.SendOutChildAgentUpdates(cadu,this); 2082 m_scene.SendOutChildAgentUpdates(cadu,this);
2083
2087 m_LastChildAgentUpdatePosition.X = AbsolutePosition.X; 2084 m_LastChildAgentUpdatePosition.X = AbsolutePosition.X;
2088 m_LastChildAgentUpdatePosition.Y = AbsolutePosition.Y; 2085 m_LastChildAgentUpdatePosition.Y = AbsolutePosition.Y;
2089 m_LastChildAgentUpdatePosition.Z = AbsolutePosition.Z; 2086 m_LastChildAgentUpdatePosition.Z = AbsolutePosition.Z;
@@ -2195,8 +2192,7 @@ namespace OpenSim.Region.Environment.Scenes
2195 "http://" + neighbourRegion.ExternalHostName + ":" + neighbourRegion.HttpPort 2192 "http://" + neighbourRegion.ExternalHostName + ":" + neighbourRegion.HttpPort
2196 + "/CAPS/" + circuitdata.CapsPath + "0000/"; 2193 + "/CAPS/" + circuitdata.CapsPath + "0000/";
2197 2194
2198 m_log.DebugFormat( 2195 m_log.DebugFormat("[CAPS]: Sending new CAPS seed url {0} to client {1}", capsPath, m_uuid);
2199 "[CAPS]: Sending new CAPS seed url {0} to client {1}", capsPath, m_uuid);
2200 2196
2201 IEventQueue eq = m_scene.RequestModuleInterface<IEventQueue>(); 2197 IEventQueue eq = m_scene.RequestModuleInterface<IEventQueue>();
2202 if (eq != null) 2198 if (eq != null)
@@ -2210,9 +2206,7 @@ namespace OpenSim.Region.Environment.Scenes
2210 { 2206 {
2211 m_controllingClient.CrossRegion(neighbourHandle, newpos, vel, neighbourRegion.ExternalEndPoint, 2207 m_controllingClient.CrossRegion(neighbourHandle, newpos, vel, neighbourRegion.ExternalEndPoint,
2212 capsPath); 2208 capsPath);
2213 } 2209 }
2214
2215
2216 2210
2217 MakeChildAgent(); 2211 MakeChildAgent();
2218 // now we have a child agent in this region. Request all interesting data about other (root) agents 2212 // now we have a child agent in this region. Request all interesting data about other (root) agents
@@ -2227,7 +2221,7 @@ namespace OpenSim.Region.Environment.Scenes
2227 // so the userinfo in UserProfileCache is not reliable any more, delete it 2221 // so the userinfo in UserProfileCache is not reliable any more, delete it
2228 if (m_scene.NeedSceneCacheClear(UUID)) 2222 if (m_scene.NeedSceneCacheClear(UUID))
2229 m_scene.CommsManager.UserProfileCacheService.RemoveUser(UUID); 2223 m_scene.CommsManager.UserProfileCacheService.RemoveUser(UUID);
2230 m_log.InfoFormat("User {0} is going to another region, profile cache removed", UUID); 2224 m_log.InfoFormat("[AVATAR]: User {0} is going to another region, profile cache removed", UUID);
2231 } 2225 }
2232 else 2226 else
2233 { 2227 {
@@ -2292,8 +2286,6 @@ namespace OpenSim.Region.Environment.Scenes
2292 2286
2293 ControllingClient.SetChildAgentThrottle(cAgentData.throttles); 2287 ControllingClient.SetChildAgentThrottle(cAgentData.throttles);
2294 2288
2295
2296
2297 // Sends out the objects in the user's draw distance if m_sendTasksToChild is true. 2289 // Sends out the objects in the user's draw distance if m_sendTasksToChild is true.
2298 if (m_scene.m_seeIntoRegionFromNeighbor) 2290 if (m_scene.m_seeIntoRegionFromNeighbor)
2299 m_pendingObjects = null; 2291 m_pendingObjects = null;