diff options
author | Melanie | 2011-05-22 20:23:25 +0100 |
---|---|---|
committer | Melanie | 2011-05-22 20:23:25 +0100 |
commit | be1996f1210ba58ba44f9715de68a3675cf13582 (patch) | |
tree | 7306bfe8a6e89bd1b2de9f145bea85f2b5645164 /OpenSim/Region/OptionalModules | |
parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
parent | Add stubs for unimplemented lsl functions (diff) | |
download | opensim-SC_OLD-be1996f1210ba58ba44f9715de68a3675cf13582.zip opensim-SC_OLD-be1996f1210ba58ba44f9715de68a3675cf13582.tar.gz opensim-SC_OLD-be1996f1210ba58ba44f9715de68a3675cf13582.tar.bz2 opensim-SC_OLD-be1996f1210ba58ba44f9715de68a3675cf13582.tar.xz |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/OptionalModules')
-rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs | 1 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/World/AutoBackup/AutoBackupModule.cs | 6 |
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; | |||
35 | using OpenSim.Region.Framework.Scenes; | 35 | using OpenSim.Region.Framework.Scenes; |
36 | using OpenSim.Tests.Common; | 36 | using OpenSim.Tests.Common; |
37 | using OpenSim.Tests.Common.Mock; | 37 | using OpenSim.Tests.Common.Mock; |
38 | using OpenSim.Tests.Common.Setup; | ||
39 | 38 | ||
40 | namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups.Tests | 39 | namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups.Tests |
41 | { | 40 | { |
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 | |||
278 | { | 278 | { |
279 | string sRegionName; | 279 | string sRegionName; |
280 | string sRegionLabel; | 280 | string sRegionLabel; |
281 | string prepend; | 281 | // string prepend; |
282 | AutoBackupModuleState state; | 282 | AutoBackupModuleState state; |
283 | 283 | ||
284 | if (parseDefault) | 284 | if (parseDefault) |
285 | { | 285 | { |
286 | sRegionName = null; | 286 | sRegionName = null; |
287 | sRegionLabel = "DEFAULT"; | 287 | sRegionLabel = "DEFAULT"; |
288 | prepend = ""; | 288 | // prepend = ""; |
289 | state = this.m_defaultState; | 289 | state = this.m_defaultState; |
290 | } | 290 | } |
291 | else | 291 | else |
292 | { | 292 | { |
293 | sRegionName = scene.RegionInfo.RegionName; | 293 | sRegionName = scene.RegionInfo.RegionName; |
294 | sRegionLabel = sRegionName; | 294 | sRegionLabel = sRegionName; |
295 | prepend = sRegionName + "."; | 295 | // prepend = sRegionName + "."; |
296 | state = null; | 296 | state = null; |
297 | } | 297 | } |
298 | 298 | ||