summaryrefslogtreecommitdiff
path: root/indra/llui/lliconctrl.cpp
diff options
context:
space:
mode:
authorVadim Savchuk <vsavchuk@productengine.com>2009-11-03 15:32:54 +0200
committerVadim Savchuk <vsavchuk@productengine.com>2009-11-03 15:32:54 +0200
commit4a3eeda1ea5b555d15758dd7abee9b11c980e5b3 (patch)
tree400016fada68cf72c5bd64bd1e972ecdf100f530 /indra/llui/lliconctrl.cpp
parent645e2588511ff55b773e22fe3c9ee2c4de37843c (diff)
parenteff50b018c93f7ddf328c750ddbea11f0a50f9c1 (diff)
Merge from default branch
--HG-- branch : product-engine
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()
}
}
-