summaryrefslogtreecommitdiff
path: root/indra/llui
diff options
context:
space:
mode:
authorNyx (Neal Orman) <nyx@lindenlab.com>2009-11-02 10:24:51 -0500
committerNyx (Neal Orman) <nyx@lindenlab.com>2009-11-02 10:24:51 -0500
commitfd585bd6b3e63bc8482d569e65740665706596fa (patch)
treef4a43895e2cfd1ccd404db9e61a5adba76ba1ca8 /indra/llui
parentd8b3e7a021b97bf3cb4494c4d9228ed0a3c16738 (diff)
parent5d64b6f15510aa74cc8e8bd31c1d16a4eec76746 (diff)
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/llui')
-rw-r--r--indra/llui/lliconctrl.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llui/lliconctrl.cpp b/indra/llui/lliconctrl.cpp
index c1bc21f2e9..b1bd2b89a9 100644
--- a/indra/llui/lliconctrl.cpp
+++ b/indra/llui/lliconctrl.cpp
@@ -124,3 +124,4 @@ void LLIconCtrl::setIconImageDrawSize()
}
}
}
+