Merge commit 'de19dc3024e5359f594d0a32c593d905163c24ea' into bigmerge

Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
author: Melanie 2011-10-11 21:21:44 +0100
committer: Melanie 2011-10-11 21:21:44 +0100
commit: cc1fe354d01f68add960944ea9ac3cd2feba4c7d (patch)
tree: e56f163d2ced85420137a811701c153c43f6a5e3 /OpenSim/Region/ScriptEngine/Shared/Api
parent: Merge commit 'a4cc5f628f053ad1f9f849addf79551cd58e9337' into bigmerge (diff)
parent: refactor: rename SOG/SOP.GetProperties() to SendPropertiesToClient() to refle... (diff)
download: opensim-SC_OLD-cc1fe354d01f68add960944ea9ac3cd2feba4c7d.zip
opensim-SC_OLD-cc1fe354d01f68add960944ea9ac3cd2feba4c7d.tar.gz
opensim-SC_OLD-cc1fe354d01f68add960944ea9ac3cd2feba4c7d.tar.bz2
opensim-SC_OLD-cc1fe354d01f68add960944ea9ac3cd2feba4c7d.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 18c0dd2..769c84e 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -3953,7 +3953,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            parentPrim.ScheduleGroupForFullUpdate();
            if (client != null)
-                parentPrim.GetProperties(client);
+                parentPrim.SendPropertiesToClient(client);
            ScriptSleep(1000);
        }
author	Melanie	2011-10-11 21:21:44 +0100
committer	Melanie	2011-10-11 21:21:44 +0100
commit	cc1fe354d01f68add960944ea9ac3cd2feba4c7d (patch)
tree	e56f163d2ced85420137a811701c153c43f6a5e3 /OpenSim/Region/ScriptEngine/Shared/Api
parent	Merge commit 'a4cc5f628f053ad1f9f849addf79551cd58e9337' into bigmerge (diff)
parent	refactor: rename SOG/SOP.GetProperties() to SendPropertiesToClient() to refle... (diff)
download	opensim-SC_OLD-cc1fe354d01f68add960944ea9ac3cd2feba4c7d.zip opensim-SC_OLD-cc1fe354d01f68add960944ea9ac3cd2feba4c7d.tar.gz opensim-SC_OLD-cc1fe354d01f68add960944ea9ac3cd2feba4c7d.tar.bz2 opensim-SC_OLD-cc1fe354d01f68add960944ea9ac3cd2feba4c7d.tar.xz

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 18c0dd2..769c84e 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -3953,7 +3953,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3953	parentPrim.ScheduleGroupForFullUpdate();	3953	parentPrim.ScheduleGroupForFullUpdate();
3954		3954
3955	if (client != null)	3955	if (client != null)
3956	parentPrim.GetProperties(client);	3956	parentPrim.SendPropertiesToClient(client);
3957		3957
3958	ScriptSleep(1000);	3958	ScriptSleep(1000);
3959	}	3959	}