aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar/InstantMessage
diff options
context:
space:
mode:
authorMelanie2012-03-15 10:55:44 +0000
committerMelanie2012-03-15 10:55:44 +0000
commit897dc5e77eff911f9dd8870535c442f632d17662 (patch)
tree4bd4606e27f4c346f0267f6fc03c4541a2dc7046 /OpenSim/Region/CoreModules/Avatar/InstantMessage
parentAllow llTeleportAgent to teleport gods when not in god mode (diff)
parentRemove property/field duplication in ScriptInstance where it's unnecessary. (diff)
downloadopensim-SC-897dc5e77eff911f9dd8870535c442f632d17662.zip
opensim-SC-897dc5e77eff911f9dd8870535c442f632d17662.tar.gz
opensim-SC-897dc5e77eff911f9dd8870535c442f632d17662.tar.bz2
opensim-SC-897dc5e77eff911f9dd8870535c442f632d17662.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/InstantMessage')
0 files changed, 0 insertions, 0 deletions
generated by cgit v1.1 at 2024-12-24 23:57:39 +0000