opensim-SC - My fork of OpenSim for IG and DG, called SledjChisl.

diff options

author	Melanie	2011-10-27 18:14:38 +0100
committer	Melanie	2011-10-27 18:14:38 +0100
commit	b975cbcbed71b12898052395fbc83a5880273190 (patch)
tree	f149288740af5227a865783a51f566bef537721e /OpenSim/Region/RegionCombinerModule/RegionCombinerPermissionModule.cs
parent	Merge branch 'master' into bigmerge (diff)
parent	Removed use of 'is' operator and casting to find the root ScenePresence in Me... (diff)
download	opensim-SC-b975cbcbed71b12898052395fbc83a5880273190.zip opensim-SC-b975cbcbed71b12898052395fbc83a5880273190.tar.gz opensim-SC-b975cbcbed71b12898052395fbc83a5880273190.tar.bz2 opensim-SC-b975cbcbed71b12898052395fbc83a5880273190.tar.xz

Merge branch 'master' into bigmerge

Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs

Diffstat (limited to 'OpenSim/Region/RegionCombinerModule/RegionCombinerPermissionModule.cs')

0 files changed, 0 insertions, 0 deletions


context:
space:
mode: