aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.Inventory.cs2
-rw-r--r--OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs2
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index ff0f3a7..2db9242 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -841,7 +841,7 @@ namespace OpenSim.Region.Environment.Scenes
841 /// <param name="packet"></param> 841 /// <param name="packet"></param>
842 /// <param name="simClient"></param> 842 /// <param name="simClient"></param>
843 public virtual void DeRezObject(Packet packet, IClientAPI remoteClient) 843 public virtual void DeRezObject(Packet packet, IClientAPI remoteClient)
844 { 844 {
845 DeRezObjectPacket DeRezPacket = (DeRezObjectPacket) packet; 845 DeRezObjectPacket DeRezPacket = (DeRezObjectPacket) packet;
846 846
847 if (DeRezPacket.AgentBlock.DestinationID == LLUUID.Zero) 847 if (DeRezPacket.AgentBlock.DestinationID == LLUUID.Zero)
diff --git a/OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs b/OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs
index f00470f..d8e4610 100644
--- a/OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs
+++ b/OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs
@@ -113,7 +113,7 @@ namespace OpenSim.Region.Modules.SvnSerialiser
113 m_svnurl = source.Configs["SVN"].GetString("URL", m_svnurl); 113 m_svnurl = source.Configs["SVN"].GetString("URL", m_svnurl);
114 m_svnuser = source.Configs["SVN"].GetString("Username", m_svnuser); 114 m_svnuser = source.Configs["SVN"].GetString("Username", m_svnuser);
115 m_svnpass = source.Configs["SVN"].GetString("Password", m_svnpass); 115 m_svnpass = source.Configs["SVN"].GetString("Password", m_svnpass);
116 m_installBackupOnLoad = source.Configs["SVN"].GetString("ImportOnStartup", m_installBackupOnLoad); 116 m_installBackupOnLoad = source.Configs["SVN"].GetBoolean("ImportOnStartup", m_installBackupOnLoad);
117 } catch(Exception) { } 117 } catch(Exception) { }
118 118
119 lock (m_scenes) 119 lock (m_scenes)