Skip to content
Snippets Groups Projects
Commit ad04dcc1 authored by Steven Bennetts's avatar Steven Bennetts
Browse files

DEV-35969 - notecards opened from object inventory are blank

Also changed notecard previews to only have a "Save" button; "Keep/Discard" behavior has been deprecated.
parent 6da22957
Branches
Tags
No related merge requests found
...@@ -73,10 +73,9 @@ LLPreviewNotecard::LLPreviewNotecard(const LLSD& key) //const LLUUID& item_id, ...@@ -73,10 +73,9 @@ LLPreviewNotecard::LLPreviewNotecard(const LLSD& key) //const LLUUID& item_id,
const LLInventoryItem *item = getItem(); const LLInventoryItem *item = getItem();
if (item) if (item)
{ {
mShowKeepDiscard = item->getPermissions().getCreator() != gAgent.getID();
//Called from floater reg: LLUICtrlFactory::getInstance()->buildFloater(this,"floater_preview_notecard.xml", FALSE);
mAssetID = item->getAssetUUID(); mAssetID = item->getAssetUUID();
} }
//Called from floater reg: LLUICtrlFactory::getInstance()->buildFloater(this,"floater_preview_notecard.xml", FALSE);
} }
LLPreviewNotecard::~LLPreviewNotecard() LLPreviewNotecard::~LLPreviewNotecard()
...@@ -91,18 +90,8 @@ BOOL LLPreviewNotecard::postBuild() ...@@ -91,18 +90,8 @@ BOOL LLPreviewNotecard::postBuild()
ed->setNotecardInfo(mItemUUID, mObjectID, getKey()); ed->setNotecardInfo(mItemUUID, mObjectID, getKey());
ed->makePristine(); ed->makePristine();
} }
if (mShowKeepDiscard)
{
childSetAction("Keep",onKeepBtn,this);
childSetAction("Discard",onDiscardBtn,this);
}
else
{
getChild<LLButton>("Keep")->setLabel(getString("Save"));
childSetAction("Keep",onClickSave,this);
childSetVisible("Discard", false);
}
childSetAction("Save", onClickSave, this);
childSetVisible("lock", FALSE); childSetVisible("lock", FALSE);
const LLInventoryItem* item = getItem(); const LLInventoryItem* item = getItem();
...@@ -137,18 +126,16 @@ void LLPreviewNotecard::setEnabled( BOOL enabled ) ...@@ -137,18 +126,16 @@ void LLPreviewNotecard::setEnabled( BOOL enabled )
childSetEnabled("Notecard Editor", enabled); childSetEnabled("Notecard Editor", enabled);
childSetVisible("lock", !enabled); childSetVisible("lock", !enabled);
childSetEnabled("desc", enabled); childSetEnabled("desc", enabled);
childSetEnabled("Keep", enabled && editor && (!editor->isPristine())); childSetEnabled("Save", enabled && editor && (!editor->isPristine()));
} }
void LLPreviewNotecard::draw() void LLPreviewNotecard::draw()
{ {
LLViewerTextEditor* editor = getChild<LLViewerTextEditor>("Notecard Editor"); LLViewerTextEditor* editor = getChild<LLViewerTextEditor>("Notecard Editor");
BOOL script_changed = !editor->isPristine(); BOOL changed = !editor->isPristine();
childSetEnabled("Keep", script_changed && getEnabled()); childSetEnabled("Save", changed && getEnabled());
LLPreview::draw(); LLPreview::draw();
} }
...@@ -293,7 +280,9 @@ void LLPreviewNotecard::loadAsset() ...@@ -293,7 +280,9 @@ void LLPreviewNotecard::loadAsset()
editor->setText(LLStringUtil::null); editor->setText(LLStringUtil::null);
editor->makePristine(); editor->makePristine();
editor->setEnabled(TRUE); editor->setEnabled(TRUE);
mAssetStatus = PREVIEW_ASSET_LOADED; // Don't set asset status here; we may not have set the item id yet
// (e.g. when this gets called initially)
//mAssetStatus = PREVIEW_ASSET_LOADED;
} }
} }
......
...@@ -102,7 +102,6 @@ class LLPreviewNotecard : public LLPreview ...@@ -102,7 +102,6 @@ class LLPreviewNotecard : public LLPreview
LLUUID mAssetID; LLUUID mAssetID;
LLUUID mObjectID; LLUUID mObjectID;
BOOL mShowKeepDiscard;
}; };
......
...@@ -83,23 +83,11 @@ ...@@ -83,23 +83,11 @@
<button <button
follows="left|bottom" follows="left|bottom"
height="20" height="20"
label="Discard" label="Save"
label_selected="Discard" label_selected="Discard"
layout="topleft" layout="topleft"
left="9" left="9"
name="Discard" name="Save"
top="332" top="332"
width="100" /> width="100" />
<button
enabled="false"
follows="left|bottom"
height="20"
label="Keep"
label_selected="Keep"
layout="topleft"
left_pad="5"
mouse_opaque="false"
name="Keep"
top_delta="0"
width="100" />
</floater> </floater>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment