summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelobjectinventory.cpp
diff options
context:
space:
mode:
authorKent Quirk <q@lindenlab.com>2010-02-17 07:44:29 -0500
committerKent Quirk <q@lindenlab.com>2010-02-17 07:44:29 -0500
commitc573679521bf260ec2e601eef7f0abf0deead2fd (patch)
tree1e5dac6edb9b49fd68c2fec47a4a5235ab8ee064 /indra/newview/llpanelobjectinventory.cpp
parentf6304197a755b4268e65d128c2695d6392d2bffd (diff)
parent1a9cd13d79467f8e01a67a7e3c4d2111a33f218a (diff)
automated merge of overnight fixes from viewer-2-0 and viewer-hotfix
Diffstat (limited to 'indra/newview/llpanelobjectinventory.cpp')
-rw-r--r--indra/newview/llpanelobjectinventory.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp
index e8ae006968..d888f8d566 100644
--- a/indra/newview/llpanelobjectinventory.cpp
+++ b/indra/newview/llpanelobjectinventory.cpp
@@ -1568,7 +1568,7 @@ void LLPanelObjectInventory::reset()
{
clearContents();
- setBorderVisible(FALSE);
+ //setBorderVisible(FALSE);
mCommitCallbackRegistrar.pushScope(); // push local callbacks