aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs3
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs4
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs3
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs29
5 files changed, 20 insertions, 21 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
index c01d66a..a0ff151 100644
--- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
@@ -196,10 +196,9 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
196 196
197 public void UpdateDatabase(UUID user, AvatarAppearance appearance) 197 public void UpdateDatabase(UUID user, AvatarAppearance appearance)
198 { 198 {
199 m_log.DebugFormat("[APPEARANCE]: UpdateDatabase"); 199 //m_log.DebugFormat("[APPEARANCE]: UpdateDatabase");
200 AvatarData adata = new AvatarData(appearance); 200 AvatarData adata = new AvatarData(appearance);
201 m_scene.AvatarService.SetAvatar(user, adata); 201 m_scene.AvatarService.SetAvatar(user, adata);
202
203 } 202 }
204 203
205 private static byte[] GetDefaultVisualParams() 204 private static byte[] GetDefaultVisualParams()
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
index bd2d8cb..227c37f 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
@@ -281,7 +281,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
281 return false; 281 return false;
282 282
283 // Try local first 283 // Try local first
284 if (m_localBackend.CreateObject(destination, sog, true)) 284 if (m_localBackend.CreateObject(destination, sog, isLocalCall))
285 { 285 {
286 //m_log.Debug("[REST COMMS]: LocalBackEnd SendCreateObject succeeded"); 286 //m_log.Debug("[REST COMMS]: LocalBackEnd SendCreateObject succeeded");
287 return true; 287 return true;
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 70aea75..62a831e 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 4bbea16..206e2f8 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2553,6 +2553,9 @@ namespace OpenSim.Region.Framework.Scenes
2553 2553
2554 return false; 2554 return false;
2555 } 2555 }
2556
2557 sceneObject.SetScene(this);
2558
2556 // Force allocation of new LocalId 2559 // Force allocation of new LocalId
2557 // 2560 //
2558 foreach (SceneObjectPart p in sceneObject.Children.Values) 2561 foreach (SceneObjectPart p in sceneObject.Children.Values)
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
index 1e7f54a..63719ac 100644
--- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
@@ -414,7 +414,7 @@ namespace OpenSim.Region.Framework.Scenes
414 /// Create the necessary child agents 414 /// Create the necessary child agents
415 List<AgentCircuitData> cagents = new List<AgentCircuitData>(); 415 List<AgentCircuitData> cagents = new List<AgentCircuitData>();
416 foreach (GridRegion neighbour in neighbours) 416 foreach (GridRegion neighbour in neighbours)
417 { 417 {
418 if (neighbour.RegionHandle != avatar.Scene.RegionInfo.RegionHandle) 418 if (neighbour.RegionHandle != avatar.Scene.RegionInfo.RegionHandle)
419 { 419 {
420 420
@@ -446,7 +446,6 @@ namespace OpenSim.Region.Framework.Scenes
446 446
447 if (avatar.Scene.CapsModule != null) 447 if (avatar.Scene.CapsModule != null)
448 { 448 {
449 // These two are the same thing!
450 avatar.Scene.CapsModule.SetChildrenSeed(avatar.UUID, seeds); 449 avatar.Scene.CapsModule.SetChildrenSeed(avatar.UUID, seeds);
451 } 450 }
452 avatar.KnownRegions = seeds; 451 avatar.KnownRegions = seeds;
@@ -516,8 +515,6 @@ namespace OpenSim.Region.Framework.Scenes
516 agent.InventoryFolder = UUID.Zero; 515 agent.InventoryFolder = UUID.Zero;
517 agent.startpos = new Vector3(128, 128, 70); 516 agent.startpos = new Vector3(128, 128, 70);
518 agent.child = true; 517 agent.child = true;
519 if (avatar.Appearance == null)
520 m_log.Debug("XXX Appearance is null!!!!");
521 agent.Appearance = avatar.Appearance; 518 agent.Appearance = avatar.Appearance;
522 519
523 InformClientOfNeighbourDelegate d = InformClientOfNeighbourAsync; 520 InformClientOfNeighbourDelegate d = InformClientOfNeighbourAsync;
@@ -1450,17 +1447,17 @@ namespace OpenSim.Region.Framework.Scenes
1450 return m_scene.GridService.GetRegionsByName(UUID.Zero, name, maxNumber); 1447 return m_scene.GridService.GetRegionsByName(UUID.Zero, name, maxNumber);
1451 } 1448 }
1452 1449
1453 //private void Dump(string msg, List<ulong> handles) 1450 private void Dump(string msg, List<ulong> handles)
1454 //{ 1451 {
1455 // m_log.InfoFormat("-------------- HANDLE DUMP ({0}) ---------", msg); 1452 m_log.InfoFormat("-------------- HANDLE DUMP ({0}) ---------", msg);
1456 // foreach (ulong handle in handles) 1453 foreach (ulong handle in handles)
1457 // { 1454 {
1458 // uint x, y; 1455 uint x, y;
1459 // Utils.LongToUInts(handle, out x, out y); 1456 Utils.LongToUInts(handle, out x, out y);
1460 // x = x / Constants.RegionSize; 1457 x = x / Constants.RegionSize;
1461 // y = y / Constants.RegionSize; 1458 y = y / Constants.RegionSize;
1462 // m_log.InfoFormat("({0}, {1})", x, y); 1459 m_log.InfoFormat("({0}, {1})", x, y);
1463 // } 1460 }
1464 //} 1461 }
1465 } 1462 }
1466} 1463}