summaryrefslogtreecommitdiff
path: root/indra/llui
diff options
context:
space:
mode:
authorPalmer <palmer@lindenlab.com>2009-11-02 08:16:05 -0800
committerPalmer <palmer@lindenlab.com>2009-11-02 08:16:05 -0800
commitc6bd28d162bce224e595afb56a4a163e08834246 (patch)
treeea9d7399b944c6215bc907a9b0deca5d27f1a8cf /indra/llui
parent3ec9f79f0782539659963f159f6b94c86d1ebd7b (diff)
parent5d64b6f15510aa74cc8e8bd31c1d16a4eec76746 (diff)
Automated merge with ssh://palmer@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()
}
}
}
+