diff options
| author | Melanie | 2013-05-11 02:35:26 +0100 |
|---|---|---|
| committer | Melanie | 2013-05-11 02:35:26 +0100 |
| commit | 13cd8c17d781c517e083cdf9d5cc3b1b95802c2d (patch) | |
| tree | 41e9d608cc0fbb486ae885d4c9e9a6ad85e39ff3 /OpenSim/Framework/EstateSettings.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC_OLD-13cd8c17d781c517e083cdf9d5cc3b1b95802c2d.zip opensim-SC_OLD-13cd8c17d781c517e083cdf9d5cc3b1b95802c2d.tar.gz opensim-SC_OLD-13cd8c17d781c517e083cdf9d5cc3b1b95802c2d.tar.bz2 opensim-SC_OLD-13cd8c17d781c517e083cdf9d5cc3b1b95802c2d.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Services/LLLoginService/LLLoginResponse.cs
OpenSim/Services/LLLoginService/LLLoginService.cs
OpenSim/Tests/Common/Mock/TestClient.cs
Diffstat (limited to 'OpenSim/Framework/EstateSettings.cs')
| -rw-r--r-- | OpenSim/Framework/EstateSettings.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Framework/EstateSettings.cs b/OpenSim/Framework/EstateSettings.cs index e03750b..5ddbd61 100644 --- a/OpenSim/Framework/EstateSettings.cs +++ b/OpenSim/Framework/EstateSettings.cs | |||
| @@ -430,6 +430,5 @@ namespace OpenSim.Framework | |||
| 430 | { | 430 | { |
| 431 | return l_EstateGroups.Contains(groupID); | 431 | return l_EstateGroups.Contains(groupID); |
| 432 | } | 432 | } |
| 433 | |||
| 434 | } | 433 | } |
| 435 | } | 434 | } |