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

Merge branch 'avination' into careminster

Browse Source
This commit is contained in:
Melanie
2013-02-07 21:26:55 +00:00
parent bb210aa2c0 bbda7b94b3
commit 8b78b9429d
9 changed files with 222 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2952,6 +2952,13 @@ namespace OpenSim.Region.Framework.Scenes
SubscribeToClientEvents(client);
sp = m_sceneGraph.CreateAndAddChildScenePresence(client, aCircuit.Appearance, type);
InventoryFolderBase cof = InventoryService.GetFolderForType(client.AgentId, (AssetType)46);
if (cof == null)
sp.COF = UUID.Zero;
else
sp.COF = cof.ID;
m_log.DebugFormat("[SCENE]: COF for {0} is {1}", client.AgentId, sp.COF);
m_eventManager.TriggerOnNewPresence(sp);
sp.TeleportFlags = (TPFlags)aCircuit.teleportFlags;

2
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@@ -441,6 +441,8 @@ namespace OpenSim.Region.Framework.Scenes
get { return (IClientCore)ControllingClient; }
}
public UUID COF { get; set; }
// public Vector3 ParentPosition { get; set; }
/// <summary>