diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-07-23 23:41:12 +0000 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-07-23 23:41:12 +0000 |
| commit | 363de6c3bc231183224aed8ba287efe450adb00b (patch) | |
| tree | a75bd8d0449ab119f25db4b0024989cba0b71697 /indra/llmessage | |
| parent | 80deb2a5358e5e912455a781b0d4aa5f29080e30 (diff) | |
svn merge -r 127683:128178 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/folder-links__merge__viewer-2.0.0.3-r127634 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
For DEV-36425 : Viewer merge for Folder Links and Types [VIEWER]
Test plans - EXTERNAL
* [ Test against a 1.30 server ]
* Test various inventory operations -- move, copy, paste-as-link, etc. on both folders and inventory items.
* Test ability to change user-created folder types. Test inventory operations on these folder types.
Test plans - INTERNAL
* Test against any inventory smoke tests.
* See test plan in QAR-1643 for full FolderLinks&Types test plan.
Diffstat (limited to 'indra/llmessage')
| -rw-r--r-- | indra/llmessage/lltransfersourceasset.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/llmessage/lltransfersourceasset.cpp b/indra/llmessage/lltransfersourceasset.cpp index c715e16e34..5a1cd95ffc 100644 --- a/indra/llmessage/lltransfersourceasset.cpp +++ b/indra/llmessage/lltransfersourceasset.cpp @@ -296,10 +296,10 @@ bool is_asset_id_knowable(LLAssetType::EType type) case LLAssetType::AT_FAVORITE: case LLAssetType::AT_LINK: case LLAssetType::AT_LINK_FOLDER: - rv = true; - break; - default: - break; + rv = true; + break; + default: + break; } return rv; } |