OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into bigmerge 

Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
avinationmerge
Melanie 2011-11-02 11:49:25 +00:00
parent 9a8715ec9a b9e700b60d
commit c55e161dc4
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
View File

@ -135,7 +135,7 @@ namespace OpenSim.Region.ClientStack.Linden
ItemUpdatedCall = m_Scene.CapsUpdateInventoryItemAsset; ItemUpdatedCall = m_Scene.CapsUpdateInventoryItemAsset;
TaskScriptUpdatedCall = m_Scene.CapsUpdateTaskInventoryScriptAsset; TaskScriptUpdatedCall = m_Scene.CapsUpdateTaskInventoryScriptAsset;
CAPSFetchInventoryDescendents = m_Scene.HandleFetchInventoryDescendentsCAPS; CAPSFetchInventoryDescendents = m_Scene.HandleFetchInventoryDescendentsCAPS;
GetClient = m_Scene.SceneContents.GetControllingClient; GetClient = m_Scene.SceneGraph.GetControllingClient;
} }
/// <summary> /// <summary>

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

@ -489,11 +489,6 @@ namespace OpenSim.Region.Framework.Scenes
get { return m_authenticateHandler; } get { return m_authenticateHandler; }
} }
public SceneGraph SceneContents
{
get { return m_sceneGraph; }
}
public bool UseBackup public bool UseBackup
{ {
get { return m_useBackup; } get { return m_useBackup; }