aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2013-07-17 15:06:33 -0700
committerDiva Canto2013-07-17 15:06:33 -0700
commit6293614074a12227bc0581bb741d9e1125af4963 (patch)
tree01468ccb72a01e5da26af213c0845390cafa4b5e
parentRevert "Cleared up much confusion in PollServiceRequestManager. Here's the hi... (diff)
parentMerge branch 'master' of git://opensimulator.org/git/opensim (diff)
downloadopensim-SC_OLD-6293614074a12227bc0581bb741d9e1125af4963.zip
opensim-SC_OLD-6293614074a12227bc0581bb741d9e1125af4963.tar.gz
opensim-SC_OLD-6293614074a12227bc0581bb741d9e1125af4963.tar.bz2
opensim-SC_OLD-6293614074a12227bc0581bb741d9e1125af4963.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
-rw-r--r--OpenSim/Region/Application/OpenSim.cs5
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 6ff7f01..b071df8 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -423,8 +423,8 @@ namespace OpenSim
423 { 423 {
424 RegionInfo regionInfo = presence.Scene.RegionInfo; 424 RegionInfo regionInfo = presence.Scene.RegionInfo;
425 425
426 if (presence.Firstname.ToLower().Contains(mainParams[2].ToLower()) && 426 if (presence.Firstname.ToLower().Equals(mainParams[2].ToLower()) &&
427 presence.Lastname.ToLower().Contains(mainParams[3].ToLower())) 427 presence.Lastname.ToLower().Equals(mainParams[3].ToLower()))
428 { 428 {
429 MainConsole.Instance.Output( 429 MainConsole.Instance.Output(
430 String.Format( 430 String.Format(
@@ -438,6 +438,7 @@ namespace OpenSim
438 presence.ControllingClient.Kick("\nThe OpenSim manager kicked you out.\n"); 438 presence.ControllingClient.Kick("\nThe OpenSim manager kicked you out.\n");
439 439
440 presence.Scene.IncomingCloseAgent(presence.UUID, force); 440 presence.Scene.IncomingCloseAgent(presence.UUID, force);
441 break;
441 } 442 }
442 } 443 }
443 444