diff options
| author | angela <angela@lindenlab.com> | 2009-11-03 11:06:59 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2009-11-03 11:06:59 +0800 |
| commit | 399e922d33ae36d415431a512020771e058454cd (patch) | |
| tree | a1e9651a4f625d799a70c62f51c2b9dd680dbb5a /indra/llui/lliconctrl.cpp | |
| parent | e12d1371cc044560fb892d222acc253f7a015f0c (diff) | |
| parent | d8b3e7a021b97bf3cb4494c4d9228ed0a3c16738 (diff) | |
merge + EXT-1926 I18N: the folder name Contents in Build tools > Contents wont honor its translation + EXT-648 Cannot edit an object you are sitting on
Diffstat (limited to 'indra/llui/lliconctrl.cpp')
| -rw-r--r-- | indra/llui/lliconctrl.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/llui/lliconctrl.cpp b/indra/llui/lliconctrl.cpp index b1bd2b89a9..82ffac9580 100644 --- a/indra/llui/lliconctrl.cpp +++ b/indra/llui/lliconctrl.cpp @@ -123,5 +123,4 @@ void LLIconCtrl::setIconImageDrawSize() mImagep->getImage()->setKnownDrawSize(mDrawWidth, mDrawHeight) ; } } -} - +}
\ No newline at end of file |