summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatersidepanelcontainer.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2013-05-21 16:18:48 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2013-05-21 16:18:48 -0400
commita04a706c1bf145505afd2da8d149ba909b56045f (patch)
tree574c526e1cf87bd840157151649d82eb689f2c5b /indra/newview/llfloatersidepanelcontainer.cpp
parent0f6a4a3389cdce6d5bb92cd6f4861a46def284cc (diff)
parent0ebcb7e3fd1452d42b5ca48139f99a4fd632d235 (diff)
merge
Diffstat (limited to 'indra/newview/llfloatersidepanelcontainer.cpp')
-rwxr-xr-x[-rw-r--r--]indra/newview/llfloatersidepanelcontainer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloatersidepanelcontainer.cpp b/indra/newview/llfloatersidepanelcontainer.cpp
index 3ea39cf196..d5bb8157cf 100644..100755
--- a/indra/newview/llfloatersidepanelcontainer.cpp
+++ b/indra/newview/llfloatersidepanelcontainer.cpp
@@ -178,4 +178,4 @@ LLSidepanelAppearance* LLFloaterSidePanelContainer::getSidePanelAppearance()
}
return panel_appearance;
-} \ No newline at end of file
+}