summaryrefslogtreecommitdiff
path: root/indra/newview/llpreviewanim.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llpreviewanim.cpp')
-rw-r--r--indra/newview/llpreviewanim.cpp222
1 files changed, 111 insertions, 111 deletions
diff --git a/indra/newview/llpreviewanim.cpp b/indra/newview/llpreviewanim.cpp
index 7f01438425..dfc41b6700 100644
--- a/indra/newview/llpreviewanim.cpp
+++ b/indra/newview/llpreviewanim.cpp
@@ -1,25 +1,25 @@
-/**
+/**
* @file llpreviewanim.cpp
* @brief LLPreviewAnim class implementation
*
* $LicenseInfo:firstyear=2004&license=viewerlgpl$
* Second Life Viewer Source Code
* Copyright (C) 2010, Linden Research, Inc.
- *
+ *
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation;
* version 2.1 of the License only.
- *
+ *
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
+ *
* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
* $/LicenseInfo$
*/
@@ -44,121 +44,121 @@ extern LLAgent gAgent;
const S32 ADVANCED_VPAD = 3;
LLPreviewAnim::LLPreviewAnim(const LLSD& key)
- : LLPreview( key )
+ : LLPreview( key )
{
- mCommitCallbackRegistrar.add("PreviewAnim.Play", boost::bind(&LLPreviewAnim::play, this, _2));
+ mCommitCallbackRegistrar.add("PreviewAnim.Play", boost::bind(&LLPreviewAnim::play, this, _2));
}
// virtual
BOOL LLPreviewAnim::postBuild()
{
- childSetCommitCallback("desc", LLPreview::onText, this);
- getChild<LLLineEditor>("desc")->setPrevalidate(&LLTextValidate::validateASCIIPrintableNoPipe);
- getChild<LLTextBox>("adv_trigger")->setClickedCallback(boost::bind(&LLPreviewAnim::showAdvanced, this));
- pAdvancedStatsTextBox = getChild<LLTextBox>("AdvancedStats");
+ childSetCommitCallback("desc", LLPreview::onText, this);
+ getChild<LLLineEditor>("desc")->setPrevalidate(&LLTextValidate::validateASCIIPrintableNoPipe);
+ getChild<LLTextBox>("adv_trigger")->setClickedCallback(boost::bind(&LLPreviewAnim::showAdvanced, this));
+ pAdvancedStatsTextBox = getChild<LLTextBox>("AdvancedStats");
// Assume that advanced stats start visible (for XUI preview tool's purposes)
pAdvancedStatsTextBox->setVisible(FALSE);
LLRect rect = getRect();
reshape(rect.getWidth(), rect.getHeight() - pAdvancedStatsTextBox->getRect().getHeight() - ADVANCED_VPAD, FALSE);
- return LLPreview::postBuild();
+ return LLPreview::postBuild();
}
// llinventorybridge also calls into here
void LLPreviewAnim::play(const LLSD& param)
{
- const LLInventoryItem *item = getItem();
-
- if(item)
- {
- LLUUID itemID=item->getAssetUUID();
-
- std::string btn_name = param.asString();
- LLButton* btn_inuse;
- LLButton* btn_other;
-
- if ("Inworld" == btn_name)
- {
- btn_inuse = getChild<LLButton>("Inworld");
- btn_other = getChild<LLButton>("Locally");
- }
- else if ("Locally" == btn_name)
- {
- btn_inuse = getChild<LLButton>("Locally");
- btn_other = getChild<LLButton>("Inworld");
- }
- else
- {
- return;
- }
-
- if (btn_inuse)
- {
- btn_inuse->toggleState();
- }
-
- if (btn_other)
- {
- btn_other->setEnabled(false);
- }
-
- if (getChild<LLUICtrl>(btn_name)->getValue().asBoolean() )
- {
- if("Inworld" == btn_name)
- {
- gAgent.sendAnimationRequest(itemID, ANIM_REQUEST_START);
- }
- else
- {
- gAgentAvatarp->startMotion(item->getAssetUUID());
- }
-
- LLMotion* motion = gAgentAvatarp->findMotion(itemID);
- if (motion)
- {
- mItemID = itemID;
- mDidStart = false;
- }
- }
- else
- {
- gAgentAvatarp->stopMotion(itemID);
- gAgent.sendAnimationRequest(itemID, ANIM_REQUEST_STOP);
-
- if (btn_other)
- {
- btn_other->setEnabled(true);
- }
- }
- }
+ const LLInventoryItem *item = getItem();
+
+ if(item)
+ {
+ LLUUID itemID=item->getAssetUUID();
+
+ std::string btn_name = param.asString();
+ LLButton* btn_inuse;
+ LLButton* btn_other;
+
+ if ("Inworld" == btn_name)
+ {
+ btn_inuse = getChild<LLButton>("Inworld");
+ btn_other = getChild<LLButton>("Locally");
+ }
+ else if ("Locally" == btn_name)
+ {
+ btn_inuse = getChild<LLButton>("Locally");
+ btn_other = getChild<LLButton>("Inworld");
+ }
+ else
+ {
+ return;
+ }
+
+ if (btn_inuse)
+ {
+ btn_inuse->toggleState();
+ }
+
+ if (btn_other)
+ {
+ btn_other->setEnabled(false);
+ }
+
+ if (getChild<LLUICtrl>(btn_name)->getValue().asBoolean() )
+ {
+ if("Inworld" == btn_name)
+ {
+ gAgent.sendAnimationRequest(itemID, ANIM_REQUEST_START);
+ }
+ else
+ {
+ gAgentAvatarp->startMotion(item->getAssetUUID());
+ }
+
+ LLMotion* motion = gAgentAvatarp->findMotion(itemID);
+ if (motion)
+ {
+ mItemID = itemID;
+ mDidStart = false;
+ }
+ }
+ else
+ {
+ gAgentAvatarp->stopMotion(itemID);
+ gAgent.sendAnimationRequest(itemID, ANIM_REQUEST_STOP);
+
+ if (btn_other)
+ {
+ btn_other->setEnabled(true);
+ }
+ }
+ }
}
// virtual
void LLPreviewAnim::draw()
{
- LLPreview::draw();
- if (!this->mItemID.isNull())
- {
- LLMotion* motion = gAgentAvatarp->findMotion(this->mItemID);
- if (motion)
- {
- if (motion->isStopped() && this->mDidStart)
- {
- cleanup();
- }
- if(gAgentAvatarp->isMotionActive(this->mItemID) && !this->mDidStart)
- {
- const LLInventoryItem *item = getItem();
- LLMotion* motion = gAgentAvatarp->findMotion(this->mItemID);
- if (item && motion)
- {
- motion->setName(item->getName());
- }
- this->mDidStart = true;
- }
- }
- }
+ LLPreview::draw();
+ if (!this->mItemID.isNull())
+ {
+ LLMotion* motion = gAgentAvatarp->findMotion(this->mItemID);
+ if (motion)
+ {
+ if (motion->isStopped() && this->mDidStart)
+ {
+ cleanup();
+ }
+ if(gAgentAvatarp->isMotionActive(this->mItemID) && !this->mDidStart)
+ {
+ const LLInventoryItem *item = getItem();
+ LLMotion* motion = gAgentAvatarp->findMotion(this->mItemID);
+ if (item && motion)
+ {
+ motion->setName(item->getName());
+ }
+ this->mDidStart = true;
+ }
+ }
+ }
}
// virtual
@@ -171,31 +171,31 @@ void LLPreviewAnim::refreshFromItem()
}
// Preload motion
- gAgentAvatarp->createMotion(item->getAssetUUID());
+ gAgentAvatarp->createMotion(item->getAssetUUID());
LLPreview::refreshFromItem();
}
void LLPreviewAnim::cleanup()
{
- this->mItemID = LLUUID::null;
- this->mDidStart = false;
- getChild<LLUICtrl>("Inworld")->setValue(FALSE);
- getChild<LLUICtrl>("Locally")->setValue(FALSE);
- getChild<LLUICtrl>("Inworld")->setEnabled(TRUE);
- getChild<LLUICtrl>("Locally")->setEnabled(TRUE);
+ this->mItemID = LLUUID::null;
+ this->mDidStart = false;
+ getChild<LLUICtrl>("Inworld")->setValue(FALSE);
+ getChild<LLUICtrl>("Locally")->setValue(FALSE);
+ getChild<LLUICtrl>("Inworld")->setEnabled(TRUE);
+ getChild<LLUICtrl>("Locally")->setEnabled(TRUE);
}
// virtual
void LLPreviewAnim::onClose(bool app_quitting)
{
- const LLInventoryItem *item = getItem();
+ const LLInventoryItem *item = getItem();
- if(item)
- {
- gAgentAvatarp->stopMotion(item->getAssetUUID());
- gAgent.sendAnimationRequest(item->getAssetUUID(), ANIM_REQUEST_STOP);
- }
+ if(item)
+ {
+ gAgentAvatarp->stopMotion(item->getAssetUUID());
+ gAgent.sendAnimationRequest(item->getAssetUUID(), ANIM_REQUEST_STOP);
+ }
}
void LLPreviewAnim::showAdvanced()
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 07:25:28 +0000