ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 01:06:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork

Browse Source 
Conflicts:
	prebuild.xml
This commit is contained in:
UbitUmarov
2012-02-10 23:03:30 +00:00
parent 7cf73cb92a 215acbcc96
commit e3f5fd81f1
17 changed files with 309 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
View File

@@ -2377,6 +2377,10 @@ namespace OpenSim.Region.Framework.Scenes
// "[SCENE OBJECT GROUP]: Linking group with root part {0}, {1} to group with root part {2}, {3}",
// objectGroup.RootPart.Name, objectGroup.RootPart.UUID, RootPart.Name, RootPart.UUID);
// Linking to ourselves is not a valid operation.
if (objectGroup == this)
return;
SceneObjectPart linkPart = objectGroup.m_rootPart;
Vector3 oldGroupPosition = linkPart.GroupPosition;