diff options
| author | Melanie | 2013-03-14 22:34:15 +0000 |
|---|---|---|
| committer | Melanie | 2013-03-14 22:34:15 +0000 |
| commit | 8b657773e4305dc853802017b3353d8d85872e14 (patch) | |
| tree | 9810e0c221baf927110b34a2d0545182e25595fd /OpenSim/Framework/Servers/ServerBase.cs | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | refactor: use LSL_Rotation(Quaternion) constructor in lLGetRootRotation() (diff) | |
| download | opensim-SC_OLD-8b657773e4305dc853802017b3353d8d85872e14.zip opensim-SC_OLD-8b657773e4305dc853802017b3353d8d85872e14.tar.gz opensim-SC_OLD-8b657773e4305dc853802017b3353d8d85872e14.tar.bz2 opensim-SC_OLD-8b657773e4305dc853802017b3353d8d85872e14.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
Diffstat (limited to 'OpenSim/Framework/Servers/ServerBase.cs')
0 files changed, 0 insertions, 0 deletions