From 1b75ec5647afeb9fbdad78f70c0c90a829bba076 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 29 Aug 2014 19:08:23 +0100
Subject: Ignore whitespace when reading serialized XML objects.
This was previously effectively being done by XmlDocument in the multiple passes through the XML.
This change tells XmlReader to ignore whitespace. This also means changing arguments to use XmlReader instead of XmlTextReader (a descendent of XmlReader) directly.
XmlReader.Create() has been the recommend way to create XML readers since .NET 2.0 as per MS SDK and is the only way to specific ignore whitespace settings.
---
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 31fc26e..05e3ee9 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -2044,7 +2044,7 @@ namespace OpenSim.Region.Framework.Scenes
///
///
///
- public static SceneObjectPart FromXml(XmlTextReader xmlReader)
+ public static SceneObjectPart FromXml(XmlReader xmlReader)
{
SceneObjectPart part = SceneObjectSerializer.Xml2ToSOP(xmlReader);
--
cgit v1.1
From 099212167b2b3d5f8bdf529d24a6c47536716706 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 29 Aug 2014 23:40:21 +0100
Subject: Implement STATUS_BLOCK_GRAB_OBJECT in llSetStatus()/llGetStatus() and
correct effect of STATUS_BLOCK_GRAB
As per http://wiki.secondlife.com/wiki/LlSetStatus
Setting STATUS_BLOCK_GRAB_OBJECT prevents or allows move of a physical linkset by grab on any prim.
Setting STATUS_BLOCK_GRAB prevents or allows move of a physical linkset by grab on a particular prim.
Previously, setting STATUS_BLOCK_GRAB would prevent drag via all prims of the linkset.
---
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 18 +-----------------
1 file changed, 1 insertion(+), 17 deletions(-)
(limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 05e3ee9..8785ca9 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -186,7 +186,7 @@ namespace OpenSim.Region.Framework.Scenes
public bool RETURN_AT_EDGE;
- public bool BlockGrab;
+ public bool BlockGrab { get; set; }
public bool StatusSandbox;
@@ -2079,22 +2079,6 @@ namespace OpenSim.Region.Framework.Scenes
ParentGroup.RootPart.RETURN_AT_EDGE = p;
}
- public bool GetBlockGrab()
- {
- if (ParentGroup.IsDeleted)
- return false;
-
- return ParentGroup.RootPart.BlockGrab;
- }
-
- public void SetBlockGrab(bool p)
- {
- if (ParentGroup.IsDeleted)
- return;
-
- ParentGroup.RootPart.BlockGrab = p;
- }
-
public void SetStatusSandbox(bool p)
{
if (ParentGroup.IsDeleted)
--
cgit v1.1