opensim-SC_OLD - My fork of OpenSim for IG and MG, called SledjChisl.

diff options

author	Melanie	2012-01-02 21:41:36 +0000
committer	Melanie	2012-01-02 21:41:36 +0000
commit	a6e305063e9045194cd8348f73f3b75d07f3883e (patch)
tree	c3287856ea47817715da89c737e3ccfe4d4c9f5d /OpenSim/Region/OptionalModules/Scripting
parent	Merge branch 'master' into careminster (diff)
parent	Reduce accessibility of some J2KImage/LLImageManager properties and methods t... (diff)
download	opensim-SC_OLD-a6e305063e9045194cd8348f73f3b75d07f3883e.zip opensim-SC_OLD-a6e305063e9045194cd8348f73f3b75d07f3883e.tar.gz opensim-SC_OLD-a6e305063e9045194cd8348f73f3b75d07f3883e.tar.bz2 opensim-SC_OLD-a6e305063e9045194cd8348f73f3b75d07f3883e.tar.xz

Merge branch 'master' into careminster

Conflicts: OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs OpenSim/Services/Interfaces/IUserAccountService.cs

Diffstat (limited to 'OpenSim/Region/OptionalModules/Scripting')

0 files changed, 0 insertions, 0 deletions


context:
space:
mode: