aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llpreviewnotecard.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:34 -0500
committerJacek Antonelli2008-08-15 23:45:34 -0500
commitcd17687f01420952712a500107e0f93e7ab8d5f8 (patch)
treece48c2b706f2c1176290e39fb555fbdf6648ce01 /linden/indra/newview/llpreviewnotecard.cpp
parentSecond Life viewer sources 1.19.0.5 (diff)
downloadmeta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.zip
meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.tar.gz
meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.tar.bz2
meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.tar.xz
Second Life viewer sources 1.19.1.0
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llpreviewnotecard.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/newview/llpreviewnotecard.cpp b/linden/indra/newview/llpreviewnotecard.cpp
index 1f0c9dc..6d7884b 100644
--- a/linden/indra/newview/llpreviewnotecard.cpp
+++ b/linden/indra/newview/llpreviewnotecard.cpp
@@ -307,7 +307,7 @@ void LLPreviewNotecard::loadAsset()
307 // The object that we're trying to look at disappeared, bail. 307 // The object that we're trying to look at disappeared, bail.
308 llwarns << "Can't find object " << mObjectUUID << " associated with notecard." << llendl; 308 llwarns << "Can't find object " << mObjectUUID << " associated with notecard." << llendl;
309 mAssetID.setNull(); 309 mAssetID.setNull();
310 editor->setText(childGetText("no_object")); 310 editor->setText(getString("no_object"));
311 editor->makePristine(); 311 editor->makePristine();
312 editor->setEnabled(FALSE); 312 editor->setEnabled(FALSE);
313 mAssetStatus = PREVIEW_ASSET_LOADED; 313 mAssetStatus = PREVIEW_ASSET_LOADED;
@@ -332,7 +332,7 @@ void LLPreviewNotecard::loadAsset()
332 else 332 else
333 { 333 {
334 mAssetID.setNull(); 334 mAssetID.setNull();
335 editor->setText(childGetText("not_allowed")); 335 editor->setText(getString("not_allowed"));
336 editor->makePristine(); 336 editor->makePristine();
337 editor->setEnabled(FALSE); 337 editor->setEnabled(FALSE);
338 mAssetStatus = PREVIEW_ASSET_LOADED; 338 mAssetStatus = PREVIEW_ASSET_LOADED;
@@ -654,7 +654,7 @@ void LLPreviewNotecard::reshape(S32 width, S32 height, BOOL called_from_parent)
654 { 654 {
655 // So that next time you open a script it will have the same height and width 655 // So that next time you open a script it will have the same height and width
656 // (although not the same position). 656 // (although not the same position).
657 gSavedSettings.setRect("NotecardEditorRect", mRect); 657 gSavedSettings.setRect("NotecardEditorRect", getRect());
658 } 658 }
659} 659}
660 660