* Fix build break in previous revision
parent
6f810a0613
commit
b6f8777dde
|
@ -841,7 +841,7 @@ namespace OpenSim.Region.Environment.Scenes
|
||||||
/// <param name="packet"></param>
|
/// <param name="packet"></param>
|
||||||
/// <param name="simClient"></param>
|
/// <param name="simClient"></param>
|
||||||
public virtual void DeRezObject(Packet packet, IClientAPI remoteClient)
|
public virtual void DeRezObject(Packet packet, IClientAPI remoteClient)
|
||||||
{
|
{
|
||||||
DeRezObjectPacket DeRezPacket = (DeRezObjectPacket) packet;
|
DeRezObjectPacket DeRezPacket = (DeRezObjectPacket) packet;
|
||||||
|
|
||||||
if (DeRezPacket.AgentBlock.DestinationID == LLUUID.Zero)
|
if (DeRezPacket.AgentBlock.DestinationID == LLUUID.Zero)
|
||||||
|
|
|
@ -113,7 +113,7 @@ namespace OpenSim.Region.Modules.SvnSerialiser
|
||||||
m_svnurl = source.Configs["SVN"].GetString("URL", m_svnurl);
|
m_svnurl = source.Configs["SVN"].GetString("URL", m_svnurl);
|
||||||
m_svnuser = source.Configs["SVN"].GetString("Username", m_svnuser);
|
m_svnuser = source.Configs["SVN"].GetString("Username", m_svnuser);
|
||||||
m_svnpass = source.Configs["SVN"].GetString("Password", m_svnpass);
|
m_svnpass = source.Configs["SVN"].GetString("Password", m_svnpass);
|
||||||
m_installBackupOnLoad = source.Configs["SVN"].GetString("ImportOnStartup", m_installBackupOnLoad);
|
m_installBackupOnLoad = source.Configs["SVN"].GetBoolean("ImportOnStartup", m_installBackupOnLoad);
|
||||||
} catch(Exception) { }
|
} catch(Exception) { }
|
||||||
|
|
||||||
lock (m_scenes)
|
lock (m_scenes)
|
||||||
|
|
Loading…
Reference in New Issue