diff --git a/indra/llui/llcommandmanager.cpp b/indra/llui/llcommandmanager.cpp
index 9ce7533e1bb633376af70fbccbd09c584ee68fd0..1b87f20d12af934d41db8c42fcf80c5f327da4ec 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 c28bcc2ec9fa0523f6b9290c3a3f194fe70f74b6..cc49238a0b41c167b9ab6c9ac1122edea9c8e48b 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()));