diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-10-07 18:44:16 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-10-07 18:44:16 -0700 |
| commit | 60c85dff83918876b23ab1ff1dfd336fc9dbc839 (patch) | |
| tree | 74a99cfc8bcf36e6354c7f74c1f7a2c7ae054140 /indra/llui | |
| parent | feabe29f356ca2bae5275a5cb0d772614166d2c5 (diff) | |
| parent | 3a280f747dae737fd03bd4c2c886aa6231c0b703 (diff) | |
Pull from richard/viewer-experience-fui/
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llcommandmanager.cpp | 2 | ||||
| -rw-r--r-- | indra/llui/llfloater.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/llui/llcommandmanager.cpp b/indra/llui/llcommandmanager.cpp index 9ce7533e1b..1b87f20d12 100644 --- a/indra/llui/llcommandmanager.cpp +++ b/indra/llui/llcommandmanager.cpp @@ -152,7 +152,7 @@ bool LLCommandManager::load() if (!commandsParams.validateBlock()) { - llerrs << "Unable to validate commands param block from file: " << commands_file << llendl; + llerrs << "Invalid commands file: " << commands_file << llendl; return false; } diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp index c28bcc2ec9..cc49238a0b 100644 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -840,9 +840,9 @@ void LLFloater::applyRectControl() if (mRectControl.size() > 1) { const LLRect& rect = getControlGroup()->getRect(mRectControl); - if (rect.getWidth() > 0 && rect.getHeight() > 0) + if (rect.notEmpty()) { - translate( rect.mLeft - getRect().mLeft, rect.mBottom - getRect().mBottom); + setOrigin(rect.mLeft, rect.mBottom); if (mResizable) { reshape(llmax(mMinWidth, rect.getWidth()), llmax(mMinHeight, rect.getHeight())); |