Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor

avinationmerge
Melanie Thielker 2010-06-26 06:17:09 +02:00
commit 06fd49bda9
14 changed files with 9103 additions and 0 deletions

View File

@ -43,6 +43,12 @@ namespace OpenSim.Region.Framework.Scenes
public delegate void ObjectDuplicateDelegate(EntityBase original, EntityBase clone); public delegate void ObjectDuplicateDelegate(EntityBase original, EntityBase clone);
public delegate void AttachToBackupDelegate(SceneObjectGroup sog);
public delegate void DetachFromBackupDelegate(SceneObjectGroup sog);
public delegate void ChangedBackupDelegate(SceneObjectGroup sog);
public delegate void ObjectCreateDelegate(EntityBase obj); public delegate void ObjectCreateDelegate(EntityBase obj);
public delegate void ObjectDeleteDelegate(EntityBase obj); public delegate void ObjectDeleteDelegate(EntityBase obj);
@ -61,6 +67,9 @@ namespace OpenSim.Region.Framework.Scenes
private PhysicsCrash handlerPhysicsCrash = null; private PhysicsCrash handlerPhysicsCrash = null;
public event ObjectDuplicateDelegate OnObjectDuplicate; public event ObjectDuplicateDelegate OnObjectDuplicate;
public event AttachToBackupDelegate OnAttachToBackup;
public event DetachFromBackupDelegate OnDetachFromBackup;
public event ChangedBackupDelegate OnChangeBackup;
public event ObjectCreateDelegate OnObjectCreate; public event ObjectCreateDelegate OnObjectCreate;
public event ObjectDeleteDelegate OnObjectRemove; public event ObjectDeleteDelegate OnObjectRemove;
@ -388,10 +397,14 @@ namespace OpenSim.Region.Framework.Scenes
m_numPrim += sceneObject.Children.Count; m_numPrim += sceneObject.Children.Count;
if (attachToBackup) if (attachToBackup)
{
sceneObject.AttachToBackup(); sceneObject.AttachToBackup();
}
if (OnObjectCreate != null) if (OnObjectCreate != null)
{
OnObjectCreate(sceneObject); OnObjectCreate(sceneObject);
}
lock (m_dictionary_lock) lock (m_dictionary_lock)
{ {
@ -458,6 +471,30 @@ namespace OpenSim.Region.Framework.Scenes
} }
} }
public void FireAttachToBackup(SceneObjectGroup obj)
{
if (OnAttachToBackup != null)
{
OnAttachToBackup(obj);
}
}
public void FireDetachFromBackup(SceneObjectGroup obj)
{
if (OnDetachFromBackup != null)
{
OnDetachFromBackup(obj);
}
}
public void FireChangeBackup(SceneObjectGroup obj)
{
if (OnChangeBackup != null)
{
OnChangeBackup(obj);
}
}
/// <summary> /// <summary>
/// Process all pending updates /// Process all pending updates
/// </summary> /// </summary>

View File

@ -200,6 +200,10 @@ namespace OpenSim.Region.Framework.Scenes
{ {
if (value) if (value)
{ {
if (m_isBackedUp)
{
m_scene.SceneGraph.FireChangeBackup(this);
}
timeLastChanged = DateTime.Now.Ticks; timeLastChanged = DateTime.Now.Ticks;
if (!m_hasGroupChanged) if (!m_hasGroupChanged)
timeFirstChanged = DateTime.Now.Ticks; timeFirstChanged = DateTime.Now.Ticks;
@ -658,6 +662,8 @@ namespace OpenSim.Region.Framework.Scenes
/// </summary> /// </summary>
public virtual void AttachToBackup() public virtual void AttachToBackup()
{ {
m_scene.SceneGraph.FireAttachToBackup(this);
if (InSceneBackup) if (InSceneBackup)
{ {
//m_log.DebugFormat( //m_log.DebugFormat(
@ -2703,6 +2709,8 @@ namespace OpenSim.Region.Framework.Scenes
/// <param name="objectGroup"></param> /// <param name="objectGroup"></param>
public virtual void DetachFromBackup() public virtual void DetachFromBackup()
{ {
m_scene.SceneGraph.FireDetachFromBackup(this);
if (m_isBackedUp) if (m_isBackedUp)
m_scene.EventManager.OnBackup -= ProcessBackup; m_scene.EventManager.OnBackup -= ProcessBackup;

BIN
bin/DiffieHellman.dll Normal file

Binary file not shown.

BIN
bin/GitSharp.Core.dll Normal file

Binary file not shown.

BIN
bin/GitSharp.Core.pdb Normal file

Binary file not shown.

BIN
bin/GitSharp.dll Normal file

Binary file not shown.

BIN
bin/GitSharp.pdb Normal file

Binary file not shown.

Binary file not shown.

File diff suppressed because it is too large Load Diff

View File

@ -883,6 +883,9 @@
PriceObjectScaleFactor = 10 PriceObjectScaleFactor = 10
PriceParcelRent = 1 PriceParcelRent = 1
[Git]
Enabled = true
RepoPath = "git"
[SVN] [SVN]
Enabled = false Enabled = false

Binary file not shown.

BIN
bin/Tamir.SharpSSH.dll Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.