diff options
| author | Melanie | 2013-02-06 04:03:32 +0100 |
|---|---|---|
| committer | Melanie | 2013-02-06 04:03:32 +0100 |
| commit | 598f891d703593bde4b96472b5d1b1ce6aaf4c74 (patch) | |
| tree | ca8d7bebec807f9cdf0cc81a353f3b685b6ccb9c /OpenSim/Region/Framework/Scenes/Scene.cs | |
| parent | Make scripts shout a error but not stop when button count is overrun on llDialog (diff) | |
| download | opensim-SC_OLD-598f891d703593bde4b96472b5d1b1ce6aaf4c74.zip opensim-SC_OLD-598f891d703593bde4b96472b5d1b1ce6aaf4c74.tar.gz opensim-SC_OLD-598f891d703593bde4b96472b5d1b1ce6aaf4c74.tar.bz2 opensim-SC_OLD-598f891d703593bde4b96472b5d1b1ce6aaf4c74.tar.xz | |
Move SoubleQueu to Util. Change HTTP inv to prioritize COF. Determine COF for SP
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index c7a38f7..e58aadc 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -2970,6 +2970,13 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2970 | SubscribeToClientEvents(client); | 2970 | SubscribeToClientEvents(client); |
| 2971 | 2971 | ||
| 2972 | sp = m_sceneGraph.CreateAndAddChildScenePresence(client, aCircuit.Appearance, type); | 2972 | sp = m_sceneGraph.CreateAndAddChildScenePresence(client, aCircuit.Appearance, type); |
| 2973 | InventoryFolderBase cof = InventoryService.GetFolderForType(client.AgentId, (AssetType)46); | ||
| 2974 | if (cof == null) | ||
| 2975 | sp.COF = UUID.Zero; | ||
| 2976 | else | ||
| 2977 | sp.COF = cof.ID; | ||
| 2978 | |||
| 2979 | m_log.DebugFormat("[SCENE]: COF for {0} is {1}", client.AgentId, sp.COF); | ||
| 2973 | m_eventManager.TriggerOnNewPresence(sp); | 2980 | m_eventManager.TriggerOnNewPresence(sp); |
| 2974 | 2981 | ||
| 2975 | sp.TeleportFlags = (TPFlags)aCircuit.teleportFlags; | 2982 | sp.TeleportFlags = (TPFlags)aCircuit.teleportFlags; |