aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
diff options
context:
space:
mode:
authorMelanie2012-10-31 21:42:06 +0000
committerMelanie2012-10-31 21:42:06 +0000
commita2c60943240ad9af8fe2bd86d990f36fc26930ee (patch)
tree15585e94e32082d7ac74bb341d82ce6bcccb8a57 /OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
parentMerge branch 'master' into careminster (diff)
parentAlso add the additional ScriptException constructor necessary to get [Seriali... (diff)
downloadopensim-SC-a2c60943240ad9af8fe2bd86d990f36fc26930ee.zip
opensim-SC-a2c60943240ad9af8fe2bd86d990f36fc26930ee.tar.gz
opensim-SC-a2c60943240ad9af8fe2bd86d990f36fc26930ee.tar.bz2
opensim-SC-a2c60943240ad9af8fe2bd86d990f36fc26930ee.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Framework/TaskInventoryItem.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
Diffstat (limited to 'OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs')
0 files changed, 0 insertions, 0 deletions
generated by cgit v1.1 at 2024-12-23 17:24:34 +0000