summaryrefslogtreecommitdiff
path: root/indra/llui/lliconctrl.cpp
diff options
context:
space:
mode:
authorPalmer <palmer@lindenlab.com>2009-11-04 17:04:17 -0800
committerPalmer <palmer@lindenlab.com>2009-11-04 17:04:17 -0800
commitd5cceb9d2f05ba4e19da3cc50ef273aa4dffc453 (patch)
treede0a6cf70ec27964f2b08040c9f217114bd49fa4 /indra/llui/lliconctrl.cpp
parentc4817c4e5856577ff56f34ba48e12cef5ee7ab6d (diff)
parent71dc13aac99458989776e93c38294f507074fce4 (diff)
Almost automated merge
Diffstat (limited to 'indra/llui/lliconctrl.cpp')
-rw-r--r--indra/llui/lliconctrl.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/llui/lliconctrl.cpp b/indra/llui/lliconctrl.cpp
index 1e2353b488..b1bd2b89a9 100644
--- a/indra/llui/lliconctrl.cpp
+++ b/indra/llui/lliconctrl.cpp
@@ -125,4 +125,3 @@ void LLIconCtrl::setIconImageDrawSize()
}
}
-