summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelobjectinventory.cpp
diff options
context:
space:
mode:
authorJames Cook <james@lindenlab.com>2009-12-07 10:40:12 -0800
committerJames Cook <james@lindenlab.com>2009-12-07 10:40:12 -0800
commit864dd45b2b8dec32552112ed76246c9b0b3f7f0b (patch)
treede5ce187a9b26f67d2515fa140aa8d313e64a51d /indra/newview/llpanelobjectinventory.cpp
parent5d4959e3a107a6a40014528dd8e17e46bf128540 (diff)
parent7ff7709f9fd07de5cc9b039562d0fe3794f6ce36 (diff)
merge
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 79e84efd5f..0012f22cdd 100644
--- a/indra/newview/llpanelobjectinventory.cpp
+++ b/indra/newview/llpanelobjectinventory.cpp
@@ -1959,4 +1959,4 @@ void LLPanelObjectInventory::onFocusReceived()
LLEditMenuHandler::gEditMenuHandler = mFolders;
LLPanel::onFocusReceived();
-} \ No newline at end of file
+}