diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2009-11-02 17:17:38 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2009-11-02 17:17:38 +0200 |
| commit | 6ac8394ac476dd877e3c139ad1693bc5f7606321 (patch) | |
| tree | 6b30f49c6850e55c077faa3375d5c3d8372e8a99 /indra/llui/lliconctrl.cpp | |
| parent | 28c0bcf7e608db5bd5c3811906be03f1457dd45d (diff) | |
| parent | 5d64b6f15510aa74cc8e8bd31c1d16a4eec76746 (diff) | |
Merge from another head of the default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/llui/lliconctrl.cpp')
| -rw-r--r-- | indra/llui/lliconctrl.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llui/lliconctrl.cpp b/indra/llui/lliconctrl.cpp index c1bc21f2e9..1e2353b488 100644 --- a/indra/llui/lliconctrl.cpp +++ b/indra/llui/lliconctrl.cpp @@ -124,3 +124,5 @@ void LLIconCtrl::setIconImageDrawSize() } } } + + |