summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelobjectinventory.cpp
diff options
context:
space:
mode:
authorChuck Linden <chuck@lindenlab.com>2010-02-17 12:59:15 -0500
committerChuck Linden <chuck@lindenlab.com>2010-02-17 12:59:15 -0500
commit29dd5afaa8a85f0b57ddb3e9e281e1e6f5b43e29 (patch)
treedced5393cf40bfc5ea42169f2433e6341bbfc1af /indra/newview/llpanelobjectinventory.cpp
parent087d4b7bc831ba3611c023fdc9feb37b0481b0d5 (diff)
parent52c4711ab0fce2444e6f89fcdd9898245f27a87d (diff)
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
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