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

diff options

author	Melanie	2011-02-07 22:08:53 +0000
committer	Melanie	2011-02-07 22:08:53 +0000
commit	3889e68c5441218a2ffeb2094b8251d31369837b (patch)
tree	69608c869c3823df4f417d9df34866f400045533 /bin/assets/TexturesAssetSet/Terrain Mountain-179cdabd-398a-9b6b-1391-4dc333ba321f.texture
parent	Repair x-query-string (diff)
parent	Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
download	opensim-SC-3889e68c5441218a2ffeb2094b8251d31369837b.zip opensim-SC-3889e68c5441218a2ffeb2094b8251d31369837b.tar.gz opensim-SC-3889e68c5441218a2ffeb2094b8251d31369837b.tar.bz2 opensim-SC-3889e68c5441218a2ffeb2094b8251d31369837b.tar.xz

Merge branch 'master' into careminster-presence-refactor

Conflicts: OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Server/Handlers/Simulation/AgentHandlers.cs OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs OpenSim/Services/GridService/HypergridLinker.cs

Diffstat (limited to 'bin/assets/TexturesAssetSet/Terrain Mountain-179cdabd-398a-9b6b-1391-4dc333ba321f.texture')

0 files changed, 0 insertions, 0 deletions


context:
space:
mode: