diff --git a/indra/llui/llcommandmanager.cpp b/indra/llui/llcommandmanager.cpp
index b1147134c21c2c35336a9e3bcb6dc8256aa48a53..42aa9b333bba9fcb2d9005c8aa84fe58af485dbb 100644
--- a/indra/llui/llcommandmanager.cpp
+++ b/indra/llui/llcommandmanager.cpp
@@ -139,7 +139,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 bc494e97f555d0be2f68221cbbb62925d495191f..177344cde7c09299d0a7aeebdf1eb4aba9b36e35 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()));