diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-12-15 19:17:30 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-12-15 19:17:30 -0500 |
| commit | 4d4406820b858d59be670f0ca03bdadefba61c53 (patch) | |
| tree | a88f0a6b544ff95bf6cb2b70ef9a9d90354cfa09 /indra/newview/llinventorybridge.cpp | |
| parent | a162d6afdae3c15641f90cee8aae29ea9e92dd98 (diff) | |
| parent | 2dd09062d199ebfe7af8d67c59ec1bdc26e124a9 (diff) | |
automated merge avp->avp
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 050676c242..bacc685130 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -2496,7 +2496,10 @@ void LLFolderBridge::folderOptionsMenu() checkFolderForContentsOfType(model, is_object) || checkFolderForContentsOfType(model, is_gesture) ) { - mItems.push_back(std::string("Folder Wearables Separator")); + if (!is_sidepanel) + { + mItems.push_back(std::string("Folder Wearables Separator")); + } // Only enable add/replace outfit for non-default folders. if (!is_default_folder) |