diff options
| author | Melanie | 2012-07-29 16:10:45 +0100 |
|---|---|---|
| committer | Melanie | 2012-07-29 16:10:45 +0100 |
| commit | 277491d871794b149fafa03cef850865435975d5 (patch) | |
| tree | 47eeb85b0ee30ef5852cf469b5293f7d6d9d9201 /OpenSim/Server/ServerMain.cs | |
| parent | Fix some merge issues and a functional issue in the scene manager (diff) | |
| parent | Return world rotation on llGetObjectDetails()'s OBJECT_ROT (diff) | |
| download | opensim-SC-277491d871794b149fafa03cef850865435975d5.zip opensim-SC-277491d871794b149fafa03cef850865435975d5.tar.gz opensim-SC-277491d871794b149fafa03cef850865435975d5.tar.bz2 opensim-SC-277491d871794b149fafa03cef850865435975d5.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions