Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Modernize constructor of LLPreviewSound and cure crash signature 314

Browse Source
This commit is contained in:
Inusaito Sayori
2013-10-30 08:37:20 -04:00
parent 9be72ffb47
commit b34a8db34a
2 changed files with 28 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
indra/newview/llpreviewsound.cpp
View File

@@ -60,10 +60,36 @@ const F32 SOUND_GAIN = 1.0f;
LLPreviewSound::LLPreviewSound(const std::string& name, const LLRect& rect, const std::string& title, const LLUUID& item_uuid, const LLUUID& object_uuid) :
LLPreview( name, rect, title, item_uuid, object_uuid)
, mIsCopyable(false)
{
LLUICtrlFactory::getInstance()->buildFloater(this,"floater_preview_sound.xml");
setTitle(title);
if (!getHost())
{
LLRect curRect = getRect();
translate(rect.mLeft - curRect.mLeft, rect.mTop - curRect.mTop);
}
}
// virtual
BOOL LLPreviewSound::postBuild()
{
const LLInventoryItem* item = getItem();
if (item)
{
getChild<LLUICtrl>("desc")->setValue(item->getDescription());
mIsCopyable = (item->getPermissions().getCreator() == gAgentID);
if (gAudiop)
// <edit>
// that thing above doesn't actually start a sound transfer, so I will do it
if (LLAudioSource* asp = gAgentAvatarp->getAudioSource(gAgentID))
asp->preload(item->getAssetUUID()); // preload the sound
// </edit>
}
childSetAction("Sound play btn",&LLPreviewSound::playSound,this);
childSetAction("Sound audition btn",&LLPreviewSound::auditionSound,this);
// <edit>
@@ -77,40 +103,10 @@ LLPreviewSound::LLPreviewSound(const std::string& name, const LLRect& rect, cons
button = getChild<LLButton>("Sound audition btn");
button->setSoundFlags(LLView::SILENT);
const LLInventoryItem* item = getItem();
mIsCopyable = false;
if(item)
{
const LLPermissions& perm = item->getPermissions();
mIsCopyable = (perm.getCreator() == gAgent.getID());
}
childSetCommitCallback("desc", LLPreview::onText, this);
childSetText("desc", item->getDescription());
getChild<LLLineEditor>("desc")->setPrevalidate(&LLLineEditor::prevalidatePrintableNotPipe);
// preload the sound
if(item && gAudiop)
{
// <edit>
// that thing above doesn't actually start a sound transfer, so I will do it
LLAudioSource *asp = gAgentAvatarp->getAudioSource(gAgent.getID());
if(asp)
{
asp->preload(item->getAssetUUID());
}
// </edit>
}
setTitle(title);
if (!getHost())
{
LLRect curRect = getRect();
translate(rect.mLeft - curRect.mLeft, rect.mTop - curRect.mTop);
}
return LLPreview::postBuild();
}
// static

1
indra/newview/llpreviewsound.h
View File

@@ -65,6 +65,7 @@ public:
// </edit>
protected:
/*virtual*/ BOOL postBuild();
virtual const char *getTitleName() const { return "Sound"; }
// <edit>
virtual BOOL canSaveAs() const;