aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Serialization
diff options
context:
space:
mode:
authorMelanie2013-01-10 01:38:03 +0000
committerMelanie2013-01-10 01:38:03 +0000
commit3a495ccd561c9e1e95407d8657065265176a03dd (patch)
treecb7e7343e7c9a15bfdd77632d389fc6b6288b709 /OpenSim/Region/Framework/Scenes/Serialization
parentMerge branch 'avination' into careminster (diff)
parentOn baked texture save, replace any HG ID with an ordinary asset ID so the HGA... (diff)
downloadopensim-SC_OLD-3a495ccd561c9e1e95407d8657065265176a03dd.zip
opensim-SC_OLD-3a495ccd561c9e1e95407d8657065265176a03dd.tar.gz
opensim-SC_OLD-3a495ccd561c9e1e95407d8657065265176a03dd.tar.bz2
opensim-SC_OLD-3a495ccd561c9e1e95407d8657065265176a03dd.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions
generated by cgit v1.1 at 2024-10-25 21:35:55 +0000