diff options
| author | Melanie | 2010-05-23 06:09:54 +0100 |
|---|---|---|
| committer | Melanie | 2010-05-23 06:09:54 +0100 |
| commit | a9dad994324122555c436a5db14ff4072fbf6c89 (patch) | |
| tree | 3b5dfbb8f6d989cff561fd304c822e7cbfc7c61a /OpenSim/Region/Application/OpenSimBase.cs | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| parent | Apply http://opensimulator.org/mantis/view.php?id=4632 (diff) | |
| download | opensim-SC_OLD-a9dad994324122555c436a5db14ff4072fbf6c89.zip opensim-SC_OLD-a9dad994324122555c436a5db14ff4072fbf6c89.tar.gz opensim-SC_OLD-a9dad994324122555c436a5db14ff4072fbf6c89.tar.bz2 opensim-SC_OLD-a9dad994324122555c436a5db14ff4072fbf6c89.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'OpenSim/Region/Application/OpenSimBase.cs')
0 files changed, 0 insertions, 0 deletions