aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/OpenSimDefaults.ini.example
diff options
context:
space:
mode:
authorMelanie2011-10-25 02:35:33 +0100
committerMelanie2011-10-25 02:35:33 +0100
commitb7237ef059ab018ab38a2b42764251271603daf0 (patch)
tree0dfeb325870a24daa02f162764fbf65b283eedef /bin/OpenSimDefaults.ini.example
parentMerge commit '79c13cd99728f09a5175dff1750dcb9d7790fcdc' into bigmerge (diff)
parentrefactor: Use SOP.SitTargetAvatar instead of calling a special GetAvatarOnSit... (diff)
downloadopensim-SC-b7237ef059ab018ab38a2b42764251271603daf0.zip
opensim-SC-b7237ef059ab018ab38a2b42764251271603daf0.tar.gz
opensim-SC-b7237ef059ab018ab38a2b42764251271603daf0.tar.bz2
opensim-SC-b7237ef059ab018ab38a2b42764251271603daf0.tar.xz
Merge commit '62a63f834b7cc056ee37c396034d0e268f66b4a8' into bigmerge
Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'bin/OpenSimDefaults.ini.example')
0 files changed, 0 insertions, 0 deletions