diff options
author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2009-11-02 10:24:51 -0500 |
---|---|---|
committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2009-11-02 10:24:51 -0500 |
commit | fd585bd6b3e63bc8482d569e65740665706596fa (patch) | |
tree | f4a43895e2cfd1ccd404db9e61a5adba76ba1ca8 /indra/llui | |
parent | d8b3e7a021b97bf3cb4494c4d9228ed0a3c16738 (diff) | |
parent | 5d64b6f15510aa74cc8e8bd31c1d16a4eec76746 (diff) |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/llui')
-rw-r--r-- | indra/llui/lliconctrl.cpp | 1 |
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() } } } + |