diff options
author | Aleric Inglewood | 2010-11-07 16:55:50 +0100 |
---|---|---|
committer | Aleric Inglewood | 2010-11-07 18:27:48 +0100 |
commit | 5b4356cefbaa7dbdc8656e7283c110a893b1a89c (patch) | |
tree | 43fae9945562c3281746370d623877840ed884b2 /linden/indra/newview/llagent.cpp | |
parent | IMP-688: ERROR: getString: Invalid string control nick01 (diff) | |
download | meta-impy-5b4356cefbaa7dbdc8656e7283c110a893b1a89c.zip meta-impy-5b4356cefbaa7dbdc8656e7283c110a893b1a89c.tar.gz meta-impy-5b4356cefbaa7dbdc8656e7283c110a893b1a89c.tar.bz2 meta-impy-5b4356cefbaa7dbdc8656e7283c110a893b1a89c.tar.xz |
IMP-692: SNOW-713: Global objects in libllcommon duplicated in plugins
See http://jira.secondlife.com/browse/SNOW-713
This patch makes llcommon shared. It contains the following snowglobe
(SVN) changesets: 3478, 3479, 3480, 3481, 3482, 3485, 3496, 3498, 3500,
3519 and 3531, plus the fix for all rejects. Note that changes
to scripts/automated_build_scripts/opensrc-build.sh (changesets 3500
and 3625) were ignored as we don't have scripts/automated_build_scripts.
Diffstat (limited to 'linden/indra/newview/llagent.cpp')
-rw-r--r-- | linden/indra/newview/llagent.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/newview/llagent.cpp b/linden/indra/newview/llagent.cpp index 8109196..5a1700a 100644 --- a/linden/indra/newview/llagent.cpp +++ b/linden/indra/newview/llagent.cpp | |||
@@ -5573,7 +5573,7 @@ class LLAgentDropGroupViewerNode : public LLHTTPNode | |||
5573 | !input.has("body") ) | 5573 | !input.has("body") ) |
5574 | { | 5574 | { |
5575 | //what to do with badly formed message? | 5575 | //what to do with badly formed message? |
5576 | response->status(400); | 5576 | response->statusUnknownError(400); |
5577 | response->result(LLSD("Invalid message parameters")); | 5577 | response->result(LLSD("Invalid message parameters")); |
5578 | } | 5578 | } |
5579 | 5579 | ||
@@ -5646,7 +5646,7 @@ class LLAgentDropGroupViewerNode : public LLHTTPNode | |||
5646 | else | 5646 | else |
5647 | { | 5647 | { |
5648 | //what to do with badly formed message? | 5648 | //what to do with badly formed message? |
5649 | response->status(400); | 5649 | response->statusUnknownError(400); |
5650 | response->result(LLSD("Invalid message parameters")); | 5650 | response->result(LLSD("Invalid message parameters")); |
5651 | } | 5651 | } |
5652 | } | 5652 | } |