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

diff options

author	Melanie	2013-07-24 04:45:07 +0100
committer	Melanie	2013-07-24 04:45:07 +0100
commit	e82d4154a2e348e4a38f01cb1877878c94569bba (patch)
tree	7b27e6d30d04f6089fd17d5779cfb0a81e50d508 /OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
parent	Merge branch 'master' into careminster (diff)
parent	For unknown user issue, bump GUN7 to GUN8 and UMMAU3 to UMMAU4 to assess what... (diff)
download	opensim-SC-e82d4154a2e348e4a38f01cb1877878c94569bba.zip opensim-SC-e82d4154a2e348e4a38f01cb1877878c94569bba.tar.gz opensim-SC-e82d4154a2e348e4a38f01cb1877878c94569bba.tar.bz2 opensim-SC-e82d4154a2e348e4a38f01cb1877878c94569bba.tar.xz

Merge branch 'master' into careminster

Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/Physics/Manager/PhysicsActor.cs OpenSim/Region/Physics/Manager/PhysicsScene.cs

Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs')

0 files changed, 0 insertions, 0 deletions


context:
space:
mode: