Fixed tree crossing. This will alleviate

http://opensimulator.org/mantis/view.php?id=4163
author: Diva Canto 2009-10-11 13:46:19 -0700
committer: Diva Canto 2009-10-11 13:46:19 -0700
commit: ef6aa444bfa8b08b6a1fbdda59a409e957cdedfb (patch)
tree: fb46ce1024a3b360840e4a8adaaed148925ca74e
parent: * Changed logic of enabling LLProxyLoginModule to follow the new style -- tru... (diff)
download: opensim-SC_OLD-ef6aa444bfa8b08b6a1fbdda59a409e957cdedfb.zip
opensim-SC_OLD-ef6aa444bfa8b08b6a1fbdda59a409e957cdedfb.tar.gz
opensim-SC_OLD-ef6aa444bfa8b08b6a1fbdda59a409e957cdedfb.tar.bz2
opensim-SC_OLD-ef6aa444bfa8b08b6a1fbdda59a409e957cdedfb.tar.xz
1 files changed, 54 insertions, 56 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index ceff28b..949cf19 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2284,75 +2284,73 @@ namespace OpenSim.Region.Framework.Scenes
            foreach (SceneObjectPart p in sceneObject.Children.Values)
                p.LocalId = 0;
-            if (sceneObject.RootPart.Shape.PCode == (byte)PCode.Prim)
+            if ((sceneObject.RootPart.Shape.PCode == (byte)PCode.Prim) && (sceneObject.RootPart.Shape.State != 0)) // Attachment
            {
-                if (sceneObject.RootPart.Shape.State != 0) // Attachment
+                sceneObject.RootPart.AddFlag(PrimFlags.TemporaryOnRez);
-                {
+                sceneObject.RootPart.AddFlag(PrimFlags.Phantom);
-                    sceneObject.RootPart.AddFlag(PrimFlags.TemporaryOnRez);
-                    sceneObject.RootPart.AddFlag(PrimFlags.Phantom);
-                    AddRestoredSceneObject(sceneObject, false, false);
-                    // Handle attachment special case
+                AddRestoredSceneObject(sceneObject, false, false);
-                    SceneObjectPart RootPrim = sceneObject.RootPart;
-                    // Fix up attachment Parent Local ID
+                // Handle attachment special case
-                    ScenePresence sp = GetScenePresence(sceneObject.OwnerID);
+                SceneObjectPart RootPrim = sceneObject.RootPart;
-                    //uint parentLocalID = 0;
+                // Fix up attachment Parent Local ID
-                    if (sp != null)
+                ScenePresence sp = GetScenePresence(sceneObject.OwnerID);
-                    {
-                        //parentLocalID = sp.LocalId;
-                        //sceneObject.RootPart.IsAttachment = true;
-                        //sceneObject.RootPart.SetParentLocalId(parentLocalID);
-                        SceneObjectGroup grp = sceneObject;
-                        //RootPrim.SetParentLocalId(parentLocalID);
-                        m_log.DebugFormat("[ATTACHMENT]: Received " +
-                                    "attachment {0}, inworld asset id {1}",
-                                    //grp.RootPart.LastOwnerID.ToString(),
-                                    grp.GetFromItemID(),
-                                    grp.UUID.ToString());
-                        //grp.SetFromAssetID(grp.RootPart.LastOwnerID);
-                        m_log.DebugFormat("[ATTACHMENT]: Attach " +
-                                "to avatar {0} at position {1}",
-                                sp.UUID.ToString(), grp.AbsolutePosition);
-                        AttachObject(sp.ControllingClient,
-                                grp.LocalId, (uint)0,
-                                grp.GroupRotation,
-                                grp.AbsolutePosition, false);
-                        RootPrim.RemFlag(PrimFlags.TemporaryOnRez);
-                        grp.SendGroupFullUpdate();
-                    }
-                    else
-                    {
-                        RootPrim.RemFlag(PrimFlags.TemporaryOnRez);
-                        RootPrim.AddFlag(PrimFlags.TemporaryOnRez);
-                    }
+                //uint parentLocalID = 0;
+                if (sp != null)
+                {
+                    //parentLocalID = sp.LocalId;
+                    //sceneObject.RootPart.IsAttachment = true;
+                    //sceneObject.RootPart.SetParentLocalId(parentLocalID);
+                    SceneObjectGroup grp = sceneObject;
+                    //RootPrim.SetParentLocalId(parentLocalID);
+                    m_log.DebugFormat("[ATTACHMENT]: Received " +
+                                "attachment {0}, inworld asset id {1}",
+                                //grp.RootPart.LastOwnerID.ToString(),
+                                grp.GetFromItemID(),
+                                grp.UUID.ToString());
+                    //grp.SetFromAssetID(grp.RootPart.LastOwnerID);
+                    m_log.DebugFormat("[ATTACHMENT]: Attach " +
+                            "to avatar {0} at position {1}",
+                            sp.UUID.ToString(), grp.AbsolutePosition);
+                    AttachObject(sp.ControllingClient,
+                            grp.LocalId, (uint)0,
+                            grp.GroupRotation,
+                            grp.AbsolutePosition, false);
+                    RootPrim.RemFlag(PrimFlags.TemporaryOnRez);
+                    grp.SendGroupFullUpdate();
                }
                else
                {
-                    AddRestoredSceneObject(sceneObject, true, false);
+                    RootPrim.RemFlag(PrimFlags.TemporaryOnRez);
+                    RootPrim.AddFlag(PrimFlags.TemporaryOnRez);
+                }
-                    if (!Permissions.CanObjectEntry(sceneObject.UUID,
+            }
-                            true, sceneObject.AbsolutePosition))
+            else
-                    {
+            {
-                        // Deny non attachments based on parcel settings
+                AddRestoredSceneObject(sceneObject, true, false);
-                        //
-                        m_log.Info("[INTERREGION]: Denied prim crossing " +
-                                "because of parcel settings");
-                        DeleteSceneObject(sceneObject, false);
+                if (!Permissions.CanObjectEntry(sceneObject.UUID,
+                        true, sceneObject.AbsolutePosition))
+                {
+                    // Deny non attachments based on parcel settings
+                    //
+                    m_log.Info("[INTERREGION]: Denied prim crossing " +
+                            "because of parcel settings");
-                        return false;
+                    DeleteSceneObject(sceneObject, false);
-                    }
+                    return false;
                }
            }
            return true;
        }
        #endregion
author	Diva Canto	2009-10-11 13:46:19 -0700
committer	Diva Canto	2009-10-11 13:46:19 -0700
commit	ef6aa444bfa8b08b6a1fbdda59a409e957cdedfb (patch)
tree	fb46ce1024a3b360840e4a8adaaed148925ca74e
parent	* Changed logic of enabling LLProxyLoginModule to follow the new style -- tru... (diff)
download	opensim-SC_OLD-ef6aa444bfa8b08b6a1fbdda59a409e957cdedfb.zip opensim-SC_OLD-ef6aa444bfa8b08b6a1fbdda59a409e957cdedfb.tar.gz opensim-SC_OLD-ef6aa444bfa8b08b6a1fbdda59a409e957cdedfb.tar.bz2 opensim-SC_OLD-ef6aa444bfa8b08b6a1fbdda59a409e957cdedfb.tar.xz

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index ceff28b..949cf19 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2284,75 +2284,73 @@ namespace OpenSim.Region.Framework.Scenes
2284	foreach (SceneObjectPart p in sceneObject.Children.Values)	2284	foreach (SceneObjectPart p in sceneObject.Children.Values)
2285	p.LocalId = 0;	2285	p.LocalId = 0;
2286		2286
2287	if (sceneObject.RootPart.Shape.PCode == (byte)PCode.Prim)	2287	if ((sceneObject.RootPart.Shape.PCode == (byte)PCode.Prim) && (sceneObject.RootPart.Shape.State != 0)) // Attachment
2288	{	2288	{
2289	if (sceneObject.RootPart.Shape.State != 0) // Attachment	2289	sceneObject.RootPart.AddFlag(PrimFlags.TemporaryOnRez);
2290	{	2290	sceneObject.RootPart.AddFlag(PrimFlags.Phantom);
2291	sceneObject.RootPart.AddFlag(PrimFlags.TemporaryOnRez);
2292	sceneObject.RootPart.AddFlag(PrimFlags.Phantom);
2293
2294	AddRestoredSceneObject(sceneObject, false, false);
2295		2291
2296	// Handle attachment special case	2292	AddRestoredSceneObject(sceneObject, false, false);
2297	SceneObjectPart RootPrim = sceneObject.RootPart;
2298		2293
2299	// Fix up attachment Parent Local ID	2294	// Handle attachment special case
2300	ScenePresence sp = GetScenePresence(sceneObject.OwnerID);	2295	SceneObjectPart RootPrim = sceneObject.RootPart;
2301		2296
2302	//uint parentLocalID = 0;	2297	// Fix up attachment Parent Local ID
2303	if (sp != null)	2298	ScenePresence sp = GetScenePresence(sceneObject.OwnerID);
2304	{
2305	//parentLocalID = sp.LocalId;
2306
2307	//sceneObject.RootPart.IsAttachment = true;
2308	//sceneObject.RootPart.SetParentLocalId(parentLocalID);
2309
2310	SceneObjectGroup grp = sceneObject;
2311
2312	//RootPrim.SetParentLocalId(parentLocalID);
2313
2314	m_log.DebugFormat("[ATTACHMENT]: Received " +
2315	"attachment {0}, inworld asset id {1}",
2316	//grp.RootPart.LastOwnerID.ToString(),
2317	grp.GetFromItemID(),
2318	grp.UUID.ToString());
2319
2320	//grp.SetFromAssetID(grp.RootPart.LastOwnerID);
2321	m_log.DebugFormat("[ATTACHMENT]: Attach " +
2322	"to avatar {0} at position {1}",
2323	sp.UUID.ToString(), grp.AbsolutePosition);
2324	AttachObject(sp.ControllingClient,
2325	grp.LocalId, (uint)0,
2326	grp.GroupRotation,
2327	grp.AbsolutePosition, false);
2328	RootPrim.RemFlag(PrimFlags.TemporaryOnRez);
2329	grp.SendGroupFullUpdate();
2330	}
2331	else
2332	{
2333	RootPrim.RemFlag(PrimFlags.TemporaryOnRez);
2334	RootPrim.AddFlag(PrimFlags.TemporaryOnRez);
2335	}
2336		2299
		2300	//uint parentLocalID = 0;
		2301	if (sp != null)
		2302	{
		2303	//parentLocalID = sp.LocalId;
		2304
		2305	//sceneObject.RootPart.IsAttachment = true;
		2306	//sceneObject.RootPart.SetParentLocalId(parentLocalID);
		2307
		2308	SceneObjectGroup grp = sceneObject;
		2309
		2310	//RootPrim.SetParentLocalId(parentLocalID);
		2311
		2312	m_log.DebugFormat("[ATTACHMENT]: Received " +
		2313	"attachment {0}, inworld asset id {1}",
		2314	//grp.RootPart.LastOwnerID.ToString(),
		2315	grp.GetFromItemID(),
		2316	grp.UUID.ToString());
		2317
		2318	//grp.SetFromAssetID(grp.RootPart.LastOwnerID);
		2319	m_log.DebugFormat("[ATTACHMENT]: Attach " +
		2320	"to avatar {0} at position {1}",
		2321	sp.UUID.ToString(), grp.AbsolutePosition);
		2322	AttachObject(sp.ControllingClient,
		2323	grp.LocalId, (uint)0,
		2324	grp.GroupRotation,
		2325	grp.AbsolutePosition, false);
		2326	RootPrim.RemFlag(PrimFlags.TemporaryOnRez);
		2327	grp.SendGroupFullUpdate();
2337	}	2328	}
2338	else	2329	else
2339	{	2330	{
2340	AddRestoredSceneObject(sceneObject, true, false);	2331	RootPrim.RemFlag(PrimFlags.TemporaryOnRez);
		2332	RootPrim.AddFlag(PrimFlags.TemporaryOnRez);
		2333	}
2341		2334
2342	if (!Permissions.CanObjectEntry(sceneObject.UUID,	2335	}
2343	true, sceneObject.AbsolutePosition))	2336	else
2344	{	2337	{
2345	// Deny non attachments based on parcel settings	2338	AddRestoredSceneObject(sceneObject, true, false);
2346	//
2347	m_log.Info("[INTERREGION]: Denied prim crossing " +
2348	"because of parcel settings");
2349		2339
2350	DeleteSceneObject(sceneObject, false);	2340	if (!Permissions.CanObjectEntry(sceneObject.UUID,
		2341	true, sceneObject.AbsolutePosition))
		2342	{
		2343	// Deny non attachments based on parcel settings
		2344	//
		2345	m_log.Info("[INTERREGION]: Denied prim crossing " +
		2346	"because of parcel settings");
2351		2347
2352	return false;	2348	DeleteSceneObject(sceneObject, false);
2353	}	2349
		2350	return false;
2354	}	2351	}
2355	}	2352	}
		2353
2356	return true;	2354	return true;
2357	}	2355	}
2358	#endregion	2356	#endregion