diff options
| author | Melanie | 2012-11-23 03:39:49 +0000 |
|---|---|---|
| committer | Melanie | 2012-11-23 03:39:49 +0000 |
| commit | ae8733bf5943e42f019007ebad951360747d4fc1 (patch) | |
| tree | 09b9cb539fc7a3a05067f47628adac7331e8cf28 /OpenSim/Framework/Monitoring/BaseStatsCollector.cs | |
| parent | Add a newline before the constant help text (diff) | |
| parent | Remove the redundant BypassPermissions() checks in EstateManagmentModule. (diff) | |
| download | opensim-SC-ae8733bf5943e42f019007ebad951360747d4fc1.zip opensim-SC-ae8733bf5943e42f019007ebad951360747d4fc1.tar.gz opensim-SC-ae8733bf5943e42f019007ebad951360747d4fc1.tar.bz2 opensim-SC-ae8733bf5943e42f019007ebad951360747d4fc1.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
OpenSim/Region/Framework/Scenes/SceneManager.cs
Diffstat (limited to 'OpenSim/Framework/Monitoring/BaseStatsCollector.cs')
0 files changed, 0 insertions, 0 deletions