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

Merge branch 'avination-current' into careminster

Browse Source 
Conflicts:
	OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
	OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
This commit is contained in:
Melanie
2013-09-16 22:32:53 +01:00
parent 2f365ea80b ddf67bf929
commit 72206a0e29
15 changed files with 147 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -591,6 +591,7 @@ namespace OpenSim.Region.Framework.Scenes
avinfo.ParentID = av.ParentID;
avsToCross.Add(avinfo);
av.PrevSitOffset = av.OffsetPosition;
av.ParentID = 0;
}