aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs
diff options
context:
space:
mode:
authorMelanie2013-03-29 23:28:47 +0000
committerMelanie2013-03-29 23:28:47 +0000
commitd5d6a274a7ab9781585cb0a239a3c5f5d3cb6007 (patch)
tree71a5d8cb9168ee3946cbce3afb5354eb7cfa407d /OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs
parentMerge commit '23ae4c0a4d813763bcc39db7693850a21727d7f2' into careminster (diff)
parentAdded missing functionality (mainly custom headers) to llHTTPRequest. (diff)
downloadopensim-SC-d5d6a274a7ab9781585cb0a239a3c5f5d3cb6007.zip
opensim-SC-d5d6a274a7ab9781585cb0a239a3c5f5d3cb6007.tar.gz
opensim-SC-d5d6a274a7ab9781585cb0a239a3c5f5d3cb6007.tar.bz2
opensim-SC-d5d6a274a7ab9781585cb0a239a3c5f5d3cb6007.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs')
0 files changed, 0 insertions, 0 deletions
generated by cgit v1.1 at 2024-12-17 23:02:16 +0000