Merge branch 'master' into careminster-presence-refactor

2 files changed, 3 insertions, 4 deletions

diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs
index 6de97b7..ee52a39 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs
@@ -35,7 +35,6 @@ using OpenSim.Framework.Communications;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Tests.Common;
 using OpenSim.Tests.Common.Mock;
-using OpenSim.Tests.Common.Setup;
 
 namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups.Tests
 {
diff --git a/OpenSim/Region/OptionalModules/World/AutoBackup/AutoBackupModule.cs b/OpenSim/Region/OptionalModules/World/AutoBackup/AutoBackupModule.cs
index b74d6e7..ec9f157 100644
--- a/OpenSim/Region/OptionalModules/World/AutoBackup/AutoBackupModule.cs
+++ b/OpenSim/Region/OptionalModules/World/AutoBackup/AutoBackupModule.cs
@@ -278,21 +278,21 @@ namespace OpenSim.Region.OptionalModules.World.AutoBackup
         {
             string sRegionName;
             string sRegionLabel;
-            string prepend;
+//            string prepend;
             AutoBackupModuleState state;
 
             if (parseDefault)
             {
                 sRegionName = null;
                 sRegionLabel = "DEFAULT";
-                prepend = "";
+//                prepend = "";
                 state = this.m_defaultState;
             }
             else
             {
                 sRegionName = scene.RegionInfo.RegionName;
                 sRegionLabel = sRegionName;
-                prepend = sRegionName + ".";
+//                prepend = sRegionName + ".";
                 state = null;
             }