aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications
diff options
context:
space:
mode:
authorMelanie2010-01-10 04:16:06 +0000
committerMelanie2010-01-10 04:16:06 +0000
commit1676e70dfe322381495b08ac1187ae9685f94e69 (patch)
treeb0b949af491811972dd866bff09f037e335c2b2b /OpenSim/Framework/Communications
parentMerge branch 'master' into careminster (diff)
parentFix a small bug in login disable code (diff)
downloadopensim-SC-1676e70dfe322381495b08ac1187ae9685f94e69.zip
opensim-SC-1676e70dfe322381495b08ac1187ae9685f94e69.tar.gz
opensim-SC-1676e70dfe322381495b08ac1187ae9685f94e69.tar.bz2
opensim-SC-1676e70dfe322381495b08ac1187ae9685f94e69.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Framework/Communications')
-rw-r--r--OpenSim/Framework/Communications/Tests/LoginServiceTests.cs10
1 files changed, 1 insertions, 9 deletions
diff --git a/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs b/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs
index 60f0ba8..a274ae7 100644
--- a/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs
+++ b/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs
@@ -388,12 +388,6 @@ namespace OpenSim.Framework.Communications.Tests
388 } 388 }
389 } 389 }
390 390
391 #region ILoginRegionsConnector Members
392 public bool RegionLoginsEnabled
393 {
394 get { return true; }
395 }
396
397 public void LogOffUserFromGrid(ulong regionHandle, OpenMetaverse.UUID AvatarID, OpenMetaverse.UUID RegionSecret, string message) 391 public void LogOffUserFromGrid(ulong regionHandle, OpenMetaverse.UUID AvatarID, OpenMetaverse.UUID RegionSecret, string message)
398 { 392 {
399 } 393 }
@@ -454,8 +448,6 @@ namespace OpenSim.Framework.Communications.Tests
454 448
455 return null; 449 return null;
456 } 450 }
457
458 #endregion
459 } 451 }
460 } 452 }
461} \ No newline at end of file 453}