mirror of
https://github.com/opensim/opensim.git
synced 2026-08-05 17:05:55 +08:00
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
This commit is contained in:
@@ -476,6 +476,7 @@ namespace OpenSim.Region.Framework.Scenes
|
||||
part.IgnoreUndoUpdate = false;
|
||||
part.StoreUndoState(UndoType.STATE_GROUP_POSITION);
|
||||
part.GroupPosition = val;
|
||||
part.TriggerScriptChangedEvent(Changed.POSITION);
|
||||
}
|
||||
|
||||
foreach (ScenePresence av in m_linkedAvatars)
|
||||
@@ -1734,9 +1735,9 @@ namespace OpenSim.Region.Framework.Scenes
|
||||
// don't backup while it's selected or you're asking for changes mid stream.
|
||||
if ((isTimeToPersist()) || (forcedBackup))
|
||||
{
|
||||
m_log.DebugFormat(
|
||||
"[SCENE]: Storing {0}, {1} in {2}",
|
||||
Name, UUID, m_scene.RegionInfo.RegionName);
|
||||
// m_log.DebugFormat(
|
||||
// "[SCENE]: Storing {0}, {1} in {2}",
|
||||
// Name, UUID, m_scene.RegionInfo.RegionName);
|
||||
|
||||
SceneObjectGroup backup_group = Copy(false);
|
||||
backup_group.RootPart.Velocity = RootPart.Velocity;
|
||||
|
||||
@@ -60,7 +60,8 @@ namespace OpenSim.Region.Framework.Scenes
|
||||
TELEPORT = 512,
|
||||
REGION_RESTART = 1024,
|
||||
MEDIA = 2048,
|
||||
ANIMATION = 16384
|
||||
ANIMATION = 16384,
|
||||
POSITION = 32768
|
||||
}
|
||||
|
||||
// I don't really know where to put this except here.
|
||||
@@ -730,6 +731,7 @@ namespace OpenSim.Region.Framework.Scenes
|
||||
}
|
||||
}
|
||||
}
|
||||
TriggerScriptChangedEvent(Changed.POSITION);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user