diff options
| author | Melanie | 2013-03-29 23:28:47 +0000 |
|---|---|---|
| committer | Melanie | 2013-03-29 23:28:47 +0000 |
| commit | d5d6a274a7ab9781585cb0a239a3c5f5d3cb6007 (patch) | |
| tree | 71a5d8cb9168ee3946cbce3afb5354eb7cfa407d /OpenSim/Data/MySQL | |
| parent | Merge commit '23ae4c0a4d813763bcc39db7693850a21727d7f2' into careminster (diff) | |
| parent | Added missing functionality (mainly custom headers) to llHTTPRequest. (diff) | |
| download | opensim-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/Data/MySQL')
0 files changed, 0 insertions, 0 deletions