aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs4
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs4
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs4
4 files changed, 9 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 3f71715..70aea75 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -2358,7 +2358,7 @@ namespace OpenSim.Region.Framework.Scenes
2358 InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId); 2358 InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId);
2359 item = InventoryService.GetItem(item); 2359 item = InventoryService.GetItem(item);
2360 2360
2361 presence.Appearance.SetAttachment((int)AttachmentPt, itemID, item.AssetID /*att.UUID*/); 2361 presence.Appearance.SetAttachment((int)AttachmentPt, itemID, /*item.AssetID*/ att.UUID);
2362 } 2362 }
2363 return att.UUID; 2363 return att.UUID;
2364 } 2364 }
@@ -2403,7 +2403,7 @@ namespace OpenSim.Region.Framework.Scenes
2403 // XXYY!! 2403 // XXYY!!
2404 InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId); 2404 InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId);
2405 item = InventoryService.GetItem(item); 2405 item = InventoryService.GetItem(item);
2406 presence.Appearance.SetAttachment((int)AttachmentPt, itemID, item.AssetID /*att.UUID*/); 2406 presence.Appearance.SetAttachment((int)AttachmentPt, itemID, /*item.AssetID*/ att.UUID);
2407 2407
2408 if (m_AvatarFactory != null) 2408 if (m_AvatarFactory != null)
2409 { 2409 {
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index db0da34..db7b3ff 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -300,7 +300,7 @@ namespace OpenSim.Region.Framework.Scenes
300 get 300 get
301 { 301 {
302 if (m_AvatarService == null) 302 if (m_AvatarService == null)
303 m_AvatarService = RequestModuleInterface<OpenSim.Services.Interfaces.IAvatarService>(); 303 m_AvatarService = RequestModuleInterface<IAvatarService>();
304 return m_AvatarService; 304 return m_AvatarService;
305 } 305 }
306 } 306 }
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
index 7d9b427..11cb8cd 100644
--- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
@@ -250,7 +250,7 @@ namespace OpenSim.Region.Framework.Scenes
250 { 250 {
251 InformClientOfNeighbourDelegate icon = (InformClientOfNeighbourDelegate) iar.AsyncState; 251 InformClientOfNeighbourDelegate icon = (InformClientOfNeighbourDelegate) iar.AsyncState;
252 icon.EndInvoke(iar); 252 icon.EndInvoke(iar);
253 m_log.WarnFormat(" --> InformClientOfNeighbourCompleted"); 253 //m_log.WarnFormat(" --> InformClientOfNeighbourCompleted");
254 } 254 }
255 255
256 /// <summary> 256 /// <summary>
@@ -456,7 +456,7 @@ namespace OpenSim.Region.Framework.Scenes
456 int count = 0; 456 int count = 0;
457 foreach (GridRegion neighbour in neighbours) 457 foreach (GridRegion neighbour in neighbours)
458 { 458 {
459 m_log.WarnFormat("--> Going to send child agent to {0}", neighbour.RegionName); 459 //m_log.WarnFormat("--> Going to send child agent to {0}", neighbour.RegionName);
460 // Don't do it if there's already an agent in that region 460 // Don't do it if there's already an agent in that region
461 if (newRegions.Contains(neighbour.RegionHandle)) 461 if (newRegions.Contains(neighbour.RegionHandle))
462 newAgent = true; 462 newAgent = true;
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 47eaa95..ae586a1 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2565,14 +2565,18 @@ namespace OpenSim.Region.Framework.Scenes
2565 } 2565 }
2566 } 2566 }
2567 } 2567 }
2568
2568 } 2569 }
2569 2570
2571
2570 #endregion Bake Cache Check 2572 #endregion Bake Cache Check
2571 2573
2572 m_appearance.SetAppearance(textureEntry, visualParams); 2574 m_appearance.SetAppearance(textureEntry, visualParams);
2573 if (m_appearance.AvatarHeight > 0) 2575 if (m_appearance.AvatarHeight > 0)
2574 SetHeight(m_appearance.AvatarHeight); 2576 SetHeight(m_appearance.AvatarHeight);
2577
2575 AvatarData adata = new AvatarData(m_appearance); 2578 AvatarData adata = new AvatarData(m_appearance);
2579
2576 m_scene.AvatarService.SetAvatar(m_controllingClient.AgentId, adata); 2580 m_scene.AvatarService.SetAvatar(m_controllingClient.AgentId, adata);
2577 2581
2578 SendAppearanceToAllOtherAgents(); 2582 SendAppearanceToAllOtherAgents();