aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/Scene.cs
diff options
context:
space:
mode:
authorMelanie Thielker2008-11-22 00:23:48 +0000
committerMelanie Thielker2008-11-22 00:23:48 +0000
commit691c4bc756b9565e648ff8ad88cfbfabd1b0be76 (patch)
tree252ba1f51e6c7c8f6eef8431869d83b704ec2803 /OpenSim/Region/Environment/Scenes/Scene.cs
parentIntroducing IPresenceModule (diff)
downloadopensim-SC-691c4bc756b9565e648ff8ad88cfbfabd1b0be76.zip
opensim-SC-691c4bc756b9565e648ff8ad88cfbfabd1b0be76.tar.gz
opensim-SC-691c4bc756b9565e648ff8ad88cfbfabd1b0be76.tar.bz2
opensim-SC-691c4bc756b9565e648ff8ad88cfbfabd1b0be76.tar.xz
Mantis #2442
Attempt to reinstate the Object Entry flag in parcel settings
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs4
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 723f874..2fcca43 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -2157,12 +2157,14 @@ namespace OpenSim.Region.Environment.Scenes
2157 if (XMLMethod == 0) 2157 if (XMLMethod == 0)
2158 { 2158 {
2159 SceneObjectGroup sceneObject = m_serialiser.DeserializeGroupFromXml2(objXMLData); 2159 SceneObjectGroup sceneObject = m_serialiser.DeserializeGroupFromXml2(objXMLData);
2160
2160 AddRestoredSceneObject(sceneObject, true, false); 2161 AddRestoredSceneObject(sceneObject, true, false);
2161 2162
2162 SceneObjectPart RootPrim = GetSceneObjectPart(primID); 2163 SceneObjectPart RootPrim = GetSceneObjectPart(primID);
2163 if (RootPrim != null) 2164 if (RootPrim != null)
2164 { 2165 {
2165 if (m_regInfo.EstateSettings.IsBanned(RootPrim.OwnerID)) 2166 if (m_regInfo.EstateSettings.IsBanned(RootPrim.OwnerID) ||
2167 Permissions.CanObjectEntry(RootPrim.UUID, true, RootPrim.AbsolutePosition))
2166 { 2168 {
2167 SceneObjectGroup grp = RootPrim.ParentGroup; 2169 SceneObjectGroup grp = RootPrim.ParentGroup;
2168 if (grp != null) 2170 if (grp != null)