diff options
author | Melanie | 2011-10-12 02:02:46 +0100 |
---|---|---|
committer | Melanie | 2011-10-12 02:02:46 +0100 |
commit | 9733b64dc8d6543f372aedbe8fb74ce3198c5f3d (patch) | |
tree | fa355e5d6d31da24823d9e452cb83fd1c95eb656 /bin/OpenSimDefaults.ini | |
parent | Merge commit '77b8fb0f86cd0342fa7331f04f56c0b5980290c2' into bigmerge (diff) | |
parent | Refactor ScenePresence so gets and sets are through properties. Added private... (diff) | |
download | opensim-SC-9733b64dc8d6543f372aedbe8fb74ce3198c5f3d.zip opensim-SC-9733b64dc8d6543f372aedbe8fb74ce3198c5f3d.tar.gz opensim-SC-9733b64dc8d6543f372aedbe8fb74ce3198c5f3d.tar.bz2 opensim-SC-9733b64dc8d6543f372aedbe8fb74ce3198c5f3d.tar.xz |
Merge commit 'bd9ba904c3e4d9c2c626a7749f19f124b4ddcf15' into bigmerge
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'bin/OpenSimDefaults.ini')
0 files changed, 0 insertions, 0 deletions