summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorRichard Linden <none@none>2012-06-25 13:04:09 -0700
committerRichard Linden <none@none>2012-06-25 13:04:09 -0700
commit5b6db72c5b7c5c3c4cfde671480ec1fc56bbd859 (patch)
tree7d6f0568329a345e96db040154607f1427ad170b /indra/newview
parent74092930afdc294ef4d204830173d4750a310616 (diff)
CHUI-101 WIP Make LLFolderView general purpose
all inventory names are correctly initialized now
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llinventorybridge.cpp11
1 files changed, 7 insertions, 4 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index c0670b71d4..70a174a140 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -1844,14 +1844,17 @@ void LLFolderBridge::buildDisplayName() const
//"Accessories" inventory category has folder type FT_NONE. So, this folder
//can not be detected as protected with LLFolderType::lookupIsProtectedType
+ mDisplayName.assign(getName());
if (accessories || LLFolderType::lookupIsProtectedType(preferred_type))
{
LLTrans::findString(mDisplayName, std::string("InvFolder ") + getName(), LLSD());
}
- else
- {
- mDisplayName.assign(getName());
- }
+
+ //if (mDisplayName.empty())
+ //{
+ // S32 foo;
+ // foo = 0;
+ //}
}