aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs10
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs34
2 files changed, 23 insertions, 21 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
index 9553f5b..4abac43 100644
--- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
@@ -528,7 +528,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
528 WearableCacheItem[] wearableCache = sp.Appearance.WearableCacheItems; 528 WearableCacheItem[] wearableCache = sp.Appearance.WearableCacheItems;
529 529
530 // big debug 530 // big debug
531 m_log.DebugFormat("[AVFACTORY]: ValidateBakedTextureCache start for {0} {1}", sp.Name, sp.UUID); 531 //m_log.DebugFormat("[AVFACTORY]: ValidateBakedTextureCache start for {0} {1}", sp.Name, sp.UUID);
532/* 532/*
533 for (int iter = 0; iter < AvatarAppearance.BAKE_INDICES.Length; iter++) 533 for (int iter = 0; iter < AvatarAppearance.BAKE_INDICES.Length; iter++)
534 { 534 {
@@ -600,7 +600,9 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
600 600
601 wearableCacheValid = (wearableCacheValid && (hits >= AvatarAppearance.BAKE_INDICES.Length - 1)); 601 wearableCacheValid = (wearableCacheValid && (hits >= AvatarAppearance.BAKE_INDICES.Length - 1));
602 if (wearableCacheValid) 602 if (wearableCacheValid)
603 m_log.Debug("[ValidateBakedCache] have valid local cache"); 603 {
604 //m_log.Debug("[ValidateBakedCache] have valid local cache");
605 }
604 else 606 else
605 wearableCache[19].TextureAsset = null; // clear optional skirt 607 wearableCache[19].TextureAsset = null; // clear optional skirt
606 } 608 }
@@ -640,7 +642,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
640 642
641 if (bakedModuleCache != null) 643 if (bakedModuleCache != null)
642 { 644 {
643 m_log.Debug("[ValidateBakedCache] got bakedModule " + bakedModuleCache.Length + " cached textures"); 645 //m_log.Debug("[ValidateBakedCache] got bakedModule " + bakedModuleCache.Length + " cached textures");
644 646
645 for (int i = 0; i < bakedModuleCache.Length; i++) 647 for (int i = 0; i < bakedModuleCache.Length; i++)
646 { 648 {
@@ -695,7 +697,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
695 } 697 }
696 698
697 // debug 699 // debug
698 m_log.DebugFormat("[ValidateBakedCache]: Completed texture check for {0} {1} with {2} hits", sp.Name, sp.UUID, hits); 700 //m_log.DebugFormat("[ValidateBakedCache]: Completed texture check for {0} {1} with {2} hits", sp.Name, sp.UUID, hits);
699/* 701/*
700 for (int iter = 0; iter < AvatarAppearance.BAKE_INDICES.Length; iter++) 702 for (int iter = 0; iter < AvatarAppearance.BAKE_INDICES.Length; iter++)
701 { 703 {
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index e10e787..74f765d 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1247,14 +1247,14 @@ namespace OpenSim.Region.Framework.Scenes
1247 // other uses need fix 1247 // other uses need fix
1248 private bool MakeRootAgent(Vector3 pos, bool isFlying, ref Vector3 lookat) 1248 private bool MakeRootAgent(Vector3 pos, bool isFlying, ref Vector3 lookat)
1249 { 1249 {
1250 int ts = Util.EnvironmentTickCount(); 1250 //int ts = Util.EnvironmentTickCount();
1251 1251
1252 lock (m_completeMovementLock) 1252 lock (m_completeMovementLock)
1253 { 1253 {
1254 if (!IsChildAgent) 1254 if (!IsChildAgent)
1255 return false; 1255 return false;
1256 1256
1257 m_log.DebugFormat("[MakeRootAgent] enter lock: {0}ms", Util.EnvironmentTickCountSubtract(ts)); 1257 //m_log.DebugFormat("[MakeRootAgent] enter lock: {0}ms", Util.EnvironmentTickCountSubtract(ts));
1258 //m_log.DebugFormat("[SCENE]: known regions in {0}: {1}", Scene.RegionInfo.RegionName, KnownChildRegionHandles.Count); 1258 //m_log.DebugFormat("[SCENE]: known regions in {0}: {1}", Scene.RegionInfo.RegionName, KnownChildRegionHandles.Count);
1259 1259
1260 // m_log.InfoFormat( 1260 // m_log.InfoFormat(
@@ -1304,7 +1304,7 @@ namespace OpenSim.Region.Framework.Scenes
1304 IsChildAgent = false; 1304 IsChildAgent = false;
1305 } 1305 }
1306 1306
1307 m_log.DebugFormat("[MakeRootAgent] out lock: {0}ms", Util.EnvironmentTickCountSubtract(ts)); 1307 //m_log.DebugFormat("[MakeRootAgent] out lock: {0}ms", Util.EnvironmentTickCountSubtract(ts));
1308 1308
1309 // Must reset this here so that a teleport to a region next to an existing region does not keep the flag 1309 // Must reset this here so that a teleport to a region next to an existing region does not keep the flag
1310 // set and prevent the close of the connection on a subsequent re-teleport. 1310 // set and prevent the close of the connection on a subsequent re-teleport.
@@ -1314,7 +1314,7 @@ namespace OpenSim.Region.Framework.Scenes
1314 RegionHandle = m_scene.RegionInfo.RegionHandle; 1314 RegionHandle = m_scene.RegionInfo.RegionHandle;
1315 1315
1316 m_scene.EventManager.TriggerSetRootAgentScene(m_uuid, m_scene); 1316 m_scene.EventManager.TriggerSetRootAgentScene(m_uuid, m_scene);
1317 m_log.DebugFormat("[MakeRootAgent] TriggerSetRootAgentScene: {0}ms", Util.EnvironmentTickCountSubtract(ts)); 1317 //m_log.DebugFormat("[MakeRootAgent] TriggerSetRootAgentScene: {0}ms", Util.EnvironmentTickCountSubtract(ts));
1318 1318
1319 if (ParentID == 0) 1319 if (ParentID == 0)
1320 { 1320 {
@@ -1453,7 +1453,7 @@ namespace OpenSim.Region.Framework.Scenes
1453 } 1453 }
1454 } 1454 }
1455 1455
1456 m_log.DebugFormat("[MakeRootAgent] position and physical: {0}ms", Util.EnvironmentTickCountSubtract(ts)); 1456 //m_log.DebugFormat("[MakeRootAgent] position and physical: {0}ms", Util.EnvironmentTickCountSubtract(ts));
1457 m_scene.SwapRootAgentCount(false); 1457 m_scene.SwapRootAgentCount(false);
1458 1458
1459 // If we don't reset the movement flag here, an avatar that crosses to a neighbouring sim and returns will 1459 // If we don't reset the movement flag here, an avatar that crosses to a neighbouring sim and returns will
@@ -1462,7 +1462,7 @@ namespace OpenSim.Region.Framework.Scenes
1462 MovementFlag = 0; 1462 MovementFlag = 0;
1463 1463
1464 m_scene.EventManager.TriggerOnMakeRootAgent(this); 1464 m_scene.EventManager.TriggerOnMakeRootAgent(this);
1465 m_log.DebugFormat("[MakeRootAgent] TriggerOnMakeRootAgent and done: {0}ms", Util.EnvironmentTickCountSubtract(ts)); 1465 //m_log.DebugFormat("[MakeRootAgent] TriggerOnMakeRootAgent and done: {0}ms", Util.EnvironmentTickCountSubtract(ts));
1466 1466
1467 return true; 1467 return true;
1468 } 1468 }
@@ -2058,7 +2058,7 @@ namespace OpenSim.Region.Framework.Scenes
2058 return; 2058 return;
2059 } 2059 }
2060 2060
2061 m_log.DebugFormat("[CompleteMovement] WaitForUpdateAgent: {0}ms", Util.EnvironmentTickCountSubtract(ts)); 2061 //m_log.DebugFormat("[CompleteMovement] WaitForUpdateAgent: {0}ms", Util.EnvironmentTickCountSubtract(ts));
2062 2062
2063 bool flying = ((m_AgentControlFlags & AgentManager.ControlFlags.AGENT_CONTROL_FLY) != 0); 2063 bool flying = ((m_AgentControlFlags & AgentManager.ControlFlags.AGENT_CONTROL_FLY) != 0);
2064 2064
@@ -2086,7 +2086,7 @@ namespace OpenSim.Region.Framework.Scenes
2086 } 2086 }
2087 2087
2088 2088
2089 m_log.DebugFormat("[CompleteMovement] MakeRootAgent: {0}ms", Util.EnvironmentTickCountSubtract(ts)); 2089 //m_log.DebugFormat("[CompleteMovement] MakeRootAgent: {0}ms", Util.EnvironmentTickCountSubtract(ts));
2090 2090
2091 if(!haveGroupInformation && !IsChildAgent && !IsNPC) 2091 if(!haveGroupInformation && !IsChildAgent && !IsNPC)
2092 { 2092 {
@@ -2094,7 +2094,7 @@ namespace OpenSim.Region.Framework.Scenes
2094 if (gm != null) 2094 if (gm != null)
2095 Grouptitle = gm.GetGroupTitle(m_uuid); 2095 Grouptitle = gm.GetGroupTitle(m_uuid);
2096 2096
2097 m_log.DebugFormat("[CompleteMovement] Missing Grouptitle: {0}ms", Util.EnvironmentTickCountSubtract(ts)); 2097 //m_log.DebugFormat("[CompleteMovement] Missing Grouptitle: {0}ms", Util.EnvironmentTickCountSubtract(ts));
2098 2098
2099 InventoryFolderBase cof = m_scene.InventoryService.GetFolderForType(client.AgentId, (FolderType)46); 2099 InventoryFolderBase cof = m_scene.InventoryService.GetFolderForType(client.AgentId, (FolderType)46);
2100 if (cof == null) 2100 if (cof == null)
@@ -2125,7 +2125,7 @@ namespace OpenSim.Region.Framework.Scenes
2125 2125
2126 Scene.SimulationService.ReleaseAgent(originID, UUID, m_callbackURI); 2126 Scene.SimulationService.ReleaseAgent(originID, UUID, m_callbackURI);
2127 m_callbackURI = null; 2127 m_callbackURI = null;
2128 m_log.DebugFormat("[CompleteMovement] ReleaseAgent: {0}ms", Util.EnvironmentTickCountSubtract(ts)); 2128 //m_log.DebugFormat("[CompleteMovement] ReleaseAgent: {0}ms", Util.EnvironmentTickCountSubtract(ts));
2129 } 2129 }
2130// else 2130// else
2131// { 2131// {
@@ -2137,7 +2137,7 @@ namespace OpenSim.Region.Framework.Scenes
2137 2137
2138 // Tell the client that we're totally ready 2138 // Tell the client that we're totally ready
2139 ControllingClient.MoveAgentIntoRegion(m_scene.RegionInfo, AbsolutePosition, look); 2139 ControllingClient.MoveAgentIntoRegion(m_scene.RegionInfo, AbsolutePosition, look);
2140 m_log.DebugFormat("[CompleteMovement] MoveAgentIntoRegion: {0}ms", Util.EnvironmentTickCountSubtract(ts)); 2140 //m_log.DebugFormat("[CompleteMovement] MoveAgentIntoRegion: {0}ms", Util.EnvironmentTickCountSubtract(ts));
2141 2141
2142 bool isHGTP = (m_teleportFlags & TeleportFlags.ViaHGLogin) != 0; 2142 bool isHGTP = (m_teleportFlags & TeleportFlags.ViaHGLogin) != 0;
2143 2143
@@ -2172,7 +2172,7 @@ namespace OpenSim.Region.Framework.Scenes
2172 m_scene.AvatarFactory.QueueAppearanceSave(UUID); 2172 m_scene.AvatarFactory.QueueAppearanceSave(UUID);
2173 } 2173 }
2174 } 2174 }
2175 m_log.DebugFormat("[CompleteMovement] Baked check: {0}ms", Util.EnvironmentTickCountSubtract(ts)); 2175 //m_log.DebugFormat("[CompleteMovement] Baked check: {0}ms", Util.EnvironmentTickCountSubtract(ts));
2176 } 2176 }
2177 2177
2178 if(m_teleportFlags > 0) 2178 if(m_teleportFlags > 0)
@@ -2260,7 +2260,7 @@ namespace OpenSim.Region.Framework.Scenes
2260 } 2260 }
2261 } // greys if 2261 } // greys if
2262 2262
2263 m_log.DebugFormat("[CompleteMovement] ValidateAndSendAppearanceAndAgentData: {0}ms", Util.EnvironmentTickCountSubtract(ts)); 2263 //m_log.DebugFormat("[CompleteMovement] ValidateAndSendAppearanceAndAgentData: {0}ms", Util.EnvironmentTickCountSubtract(ts));
2264 2264
2265 // attachments 2265 // attachments
2266 if (IsNPC || IsRealLogin(m_teleportFlags)) 2266 if (IsNPC || IsRealLogin(m_teleportFlags))
@@ -2309,7 +2309,7 @@ namespace OpenSim.Region.Framework.Scenes
2309 } 2309 }
2310 } 2310 }
2311 2311
2312 m_log.DebugFormat("[CompleteMovement] attachments: {0}ms", Util.EnvironmentTickCountSubtract(ts)); 2312 //m_log.DebugFormat("[CompleteMovement] attachments: {0}ms", Util.EnvironmentTickCountSubtract(ts));
2313 if (openChildAgents) 2313 if (openChildAgents)
2314 { 2314 {
2315 // Create child agents in neighbouring regions 2315 // Create child agents in neighbouring regions
@@ -2327,7 +2327,7 @@ namespace OpenSim.Region.Framework.Scenes
2327 m_childUpdatesBusy = false; // allow them 2327 m_childUpdatesBusy = false; // allow them
2328 } 2328 }
2329 2329
2330 m_log.DebugFormat("[CompleteMovement] openChildAgents: {0}ms", Util.EnvironmentTickCountSubtract(ts)); 2330 //m_log.DebugFormat("[CompleteMovement] openChildAgents: {0}ms", Util.EnvironmentTickCountSubtract(ts));
2331 2331
2332 // send the rest of the world 2332 // send the rest of the world
2333 if (m_teleportFlags > 0 && !IsNPC || m_currentParcelHide) 2333 if (m_teleportFlags > 0 && !IsNPC || m_currentParcelHide)
@@ -2339,7 +2339,7 @@ namespace OpenSim.Region.Framework.Scenes
2339// m_reprioritizationLastTime = Util.EnvironmentTickCount() + 15000; // delay it 2339// m_reprioritizationLastTime = Util.EnvironmentTickCount() + 15000; // delay it
2340// m_reprioritizationBusy = false; 2340// m_reprioritizationBusy = false;
2341 2341
2342 m_log.DebugFormat("[CompleteMovement] SendInitialDataToMe: {0}ms", Util.EnvironmentTickCountSubtract(ts)); 2342 //m_log.DebugFormat("[CompleteMovement] SendInitialDataToMe: {0}ms", Util.EnvironmentTickCountSubtract(ts));
2343 2343
2344 if (!IsChildAgent && openChildAgents) 2344 if (!IsChildAgent && openChildAgents)
2345 { 2345 {
@@ -2351,7 +2351,7 @@ namespace OpenSim.Region.Framework.Scenes
2351 else 2351 else
2352 friendsModule.SendFriendsOnlineIfNeeded(ControllingClient); 2352 friendsModule.SendFriendsOnlineIfNeeded(ControllingClient);
2353 } 2353 }
2354 m_log.DebugFormat("[CompleteMovement] friendsModule: {0}ms", Util.EnvironmentTickCountSubtract(ts)); 2354 //m_log.DebugFormat("[CompleteMovement] friendsModule: {0}ms", Util.EnvironmentTickCountSubtract(ts));
2355 2355
2356 } 2356 }
2357 } 2357 }