diff options
author | Melanie | 2012-07-13 02:27:16 +0100 |
---|---|---|
committer | Melanie | 2012-07-13 02:27:16 +0100 |
commit | 64393a7ca89e2c7c6f032f9da096feb8db7fb24f (patch) | |
tree | 12e0aaae0401cde2e4310f25efa96a64559ae939 /OpenSim/Region/Framework/Scenes/Scene.cs | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Remove a callstack print out I accidentally left in 2 commits ago in 9ccb578 (diff) | |
download | opensim-SC_OLD-64393a7ca89e2c7c6f032f9da096feb8db7fb24f.zip opensim-SC_OLD-64393a7ca89e2c7c6f032f9da096feb8db7fb24f.tar.gz opensim-SC_OLD-64393a7ca89e2c7c6f032f9da096feb8db7fb24f.tar.bz2 opensim-SC_OLD-64393a7ca89e2c7c6f032f9da096feb8db7fb24f.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index eae8b8e..19f319c 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -811,7 +811,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
811 | } | 811 | } |
812 | } | 812 | } |
813 | 813 | ||
814 | string grant = startupConfig.GetString("AllowedViewerList", String.Empty); | 814 | string grant = startupConfig.GetString("AllowedClients", String.Empty); |
815 | if (grant.Length > 0) | 815 | if (grant.Length > 0) |
816 | { | 816 | { |
817 | foreach (string viewer in grant.Split(',')) | 817 | foreach (string viewer in grant.Split(',')) |
@@ -820,7 +820,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
820 | } | 820 | } |
821 | } | 821 | } |
822 | 822 | ||
823 | grant = startupConfig.GetString("BannedViewerList", String.Empty); | 823 | grant = startupConfig.GetString("BannedClients", String.Empty); |
824 | if (grant.Length > 0) | 824 | if (grant.Length > 0) |
825 | { | 825 | { |
826 | foreach (string viewer in grant.Split(',')) | 826 | foreach (string viewer in grant.Split(',')) |