From 5b6db72c5b7c5c3c4cfde671480ec1fc56bbd859 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Mon, 25 Jun 2012 13:04:09 -0700
Subject: [PATCH] CHUI-101 WIP Make LLFolderView general purpose all inventory
names are correctly initialized now
---
indra/newview/llinventorybridge.cpp | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index c0670b71d49..70a174a1400 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;
+ //}
}
--
GitLab