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

Merge branch 'master' into careminster

Browse Source 
Conflicts:
	OpenSim/Region/Application/OpenSimBase.cs
This commit is contained in:
Melanie
2012-03-11 02:29:43 +00:00
parent 3dbf754651 291dc39691
commit f292e19689
12 changed files with 297 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
View File

@@ -630,7 +630,7 @@ namespace OpenSim.Region.RegionCombinerModule
List<Vector3> CoarseLocations = new List<Vector3>();
List<UUID> AvatarUUIDs = new List<UUID>();
connectiondata.RegionScene.ForEachRootScenePresence(delegate(ScenePresence sp)
{
if (sp.UUID != presence.UUID)