diff options
| author | Melanie | 2013-08-11 17:31:25 +0100 |
|---|---|---|
| committer | Melanie | 2013-08-11 17:31:25 +0100 |
| commit | ad1b2902f247a998f23e0d677ee50b10ab306396 (patch) | |
| tree | 34dadb17811f2fba2f41595ce040e8a9352acc18 /OpenSim/Server/ServerMain.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Stats treaking. Update ToOSDMap for Stat and PercentageStat to return (diff) | |
| download | opensim-SC-ad1b2902f247a998f23e0d677ee50b10ab306396.zip opensim-SC-ad1b2902f247a998f23e0d677ee50b10ab306396.tar.gz opensim-SC-ad1b2902f247a998f23e0d677ee50b10ab306396.tar.bz2 opensim-SC-ad1b2902f247a998f23e0d677ee50b10ab306396.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Application/OpenSimBase.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'OpenSim/Server/ServerMain.cs')
0 files changed, 0 insertions, 0 deletions