merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r 79986 : 80178 -> release.

QAR-290 = QAR-271 + QAR-191

1 files changed, 3 insertions, 3 deletions

diff --git a/indra/newview/llpreviewnotecard.cpp b/indra/newview/llpreviewnotecard.cpp
index eef8c0d636..37d0ba8303 100644
--- a/indra/newview/llpreviewnotecard.cpp
+++ b/indra/newview/llpreviewnotecard.cpp
@@ -307,7 +307,7 @@ void LLPreviewNotecard::loadAsset()
 						// The object that we're trying to look at disappeared, bail.
 						llwarns << "Can't find object " << mObjectUUID << " associated with notecard." << llendl;
 						mAssetID.setNull();
-						editor->setText(childGetText("no_object"));
+						editor->setText(getString("no_object"));
 						editor->makePristine();
 						editor->setEnabled(FALSE);
 						mAssetStatus = PREVIEW_ASSET_LOADED;
@@ -332,7 +332,7 @@ void LLPreviewNotecard::loadAsset()
 		else
 		{
 			mAssetID.setNull();
-			editor->setText(childGetText("not_allowed"));
+			editor->setText(getString("not_allowed"));
 			editor->makePristine();
 			editor->setEnabled(FALSE);
 			mAssetStatus = PREVIEW_ASSET_LOADED;
@@ -654,7 +654,7 @@ void LLPreviewNotecard::reshape(S32 width, S32 height, BOOL called_from_parent)
 	{
 		// So that next time you open a script it will have the same height and width 
 		// (although not the same position).
-		gSavedSettings.setRect("NotecardEditorRect", mRect);
+		gSavedSettings.setRect("NotecardEditorRect", getRect());
 	}
 }