aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine
diff options
context:
space:
mode:
authorMelanie2012-04-20 16:48:43 +0100
committerMelanie2012-04-20 16:48:43 +0100
commit464fb2533f29c98cba27d7a99529e49c8c108d7d (patch)
tree233543c1aee30a17352028489b92ac350969a2b2 /OpenSim/Region/ScriptEngine
parentMerge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ... (diff)
parentAlways dispose of existing opened bitmap from file in SaveFile(), instead of ... (diff)
downloadopensim-SC-464fb2533f29c98cba27d7a99529e49c8c108d7d.zip
opensim-SC-464fb2533f29c98cba27d7a99529e49c8c108d7d.tar.gz
opensim-SC-464fb2533f29c98cba27d7a99529e49c8c108d7d.tar.bz2
opensim-SC-464fb2533f29c98cba27d7a99529e49c8c108d7d.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions
generated by cgit v1.1 at 2024-12-25 06:10:10 +0000