ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 08:55:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Several more buglets removed.

Browse Source
This commit is contained in:
Diva Canto
2010-01-13 09:17:30 -08:00
parent 011a1b3798
commit 7356860b48
15 changed files with 75 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
View File

@@ -2358,7 +2358,7 @@ namespace OpenSim.Region.Framework.Scenes
InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId);
item = InventoryService.GetItem(item);
presence.Appearance.SetAttachment((int)AttachmentPt, itemID, /*item.AssetID*/ att.UUID);
presence.Appearance.SetAttachment((int)AttachmentPt, itemID, item.AssetID /*att.UUID*/);
}
return att.UUID;
}
@@ -2403,7 +2403,7 @@ namespace OpenSim.Region.Framework.Scenes
// XXYY!!
InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId);
item = InventoryService.GetItem(item);
presence.Appearance.SetAttachment((int)AttachmentPt, itemID, /*item.AssetID*/ att.UUID);
presence.Appearance.SetAttachment((int)AttachmentPt, itemID, item.AssetID /* att.UUID */);
if (m_AvatarFactory != null)
{

3
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@@ -2553,6 +2553,9 @@ namespace OpenSim.Region.Framework.Scenes
return false;
}
sceneObject.SetScene(this);
// Force allocation of new LocalId
//
foreach (SceneObjectPart p in sceneObject.Children.Values)

29
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
View File

@@ -414,7 +414,7 @@ namespace OpenSim.Region.Framework.Scenes
/// Create the necessary child agents
List<AgentCircuitData> cagents = new List<AgentCircuitData>();
foreach (GridRegion neighbour in neighbours)
{
{
if (neighbour.RegionHandle != avatar.Scene.RegionInfo.RegionHandle)
{
@@ -446,7 +446,6 @@ namespace OpenSim.Region.Framework.Scenes
if (avatar.Scene.CapsModule != null)
{
// These two are the same thing!
avatar.Scene.CapsModule.SetChildrenSeed(avatar.UUID, seeds);
}
avatar.KnownRegions = seeds;
@@ -516,8 +515,6 @@ namespace OpenSim.Region.Framework.Scenes
agent.InventoryFolder = UUID.Zero;
agent.startpos = new Vector3(128, 128, 70);
agent.child = true;
if (avatar.Appearance == null)
m_log.Debug("XXX Appearance is null!!!!");
agent.Appearance = avatar.Appearance;
InformClientOfNeighbourDelegate d = InformClientOfNeighbourAsync;
@@ -1450,17 +1447,17 @@ namespace OpenSim.Region.Framework.Scenes
return m_scene.GridService.GetRegionsByName(UUID.Zero, name, maxNumber);
}
//private void Dump(string msg, List<ulong> handles)
//{
// m_log.InfoFormat("-------------- HANDLE DUMP ({0}) ---------", msg);
// foreach (ulong handle in handles)
// {
// uint x, y;
// Utils.LongToUInts(handle, out x, out y);
// x = x / Constants.RegionSize;
// y = y / Constants.RegionSize;
// m_log.InfoFormat("({0}, {1})", x, y);
// }
//}
private void Dump(string msg, List<ulong> handles)
{
m_log.InfoFormat("-------------- HANDLE DUMP ({0}) ---------", msg);
foreach (ulong handle in handles)
{
uint x, y;
Utils.LongToUInts(handle, out x, out y);
x = x / Constants.RegionSize;
y = y / Constants.RegionSize;
m_log.InfoFormat("({0}, {1})", x, y);
}
}
}
}