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

HonK hOnk hoNK

Browse Source 
Signed-off-by: Beeks <HgDelirium@gmail.com>
This commit is contained in:
Beeks
2010-10-26 23:05:08 -04:00
parent 55343314e1
commit d3cb5edf2c
5 changed files with 597 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

246
indra/newview/hbfloatergrouptitles.cpp Normal file
View File

@@ -0,0 +1,246 @@
/**
* @file hbfloatergrouptitles.h
* @brief HBFloaterGroupTitles class implementation
*
* This class implements a floater where all available group titles are
* listed, allowing the user to activate any via simple double-click.
*
* $LicenseInfo:firstyear=2010&license=viewergpl$
*
* Copyright (c) 2010, Henri Beauchamp.
*
* Second Life Viewer Source Code
* The source code in this file ("Source Code") is provided by Linden Lab
* to you under the terms of the GNU General Public License, version 2.0
* ("GPL"), unless you have obtained a separate licensing agreement
* ("Other License"), formally executed by you and Linden Lab. Terms of
* the GPL can be found in doc/GPL-license.txt in this distribution, or
* online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
*
* There are special exceptions to the terms and conditions of the GPL as
* it is applied to this Source Code. View the full text of the exception
* in the file doc/FLOSS-exception.txt in this software distribution, or
* online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
*
* By copying, modifying or distributing this software, you acknowledge
* that you have read and understood your obligations described above,
* and agree to abide by those obligations.
*
* ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
* COMPLETENESS OR PERFORMANCE.
* $/LicenseInfo$
*/
#include "llviewerprecompiledheaders.h"
#include "message.h"
#include "roles_constants.h"
#include "hbfloatergrouptitles.h"
#include "llagent.h"
#include "lluictrlfactory.h"
#include "llviewercontrol.h"
// static variable
HBFloaterGroupTitles* HBFloaterGroupTitles::sInstance = NULL;
// helper function
void update_titles_list(HBFloaterGroupTitles* self);
// HBFloaterGroupTitlesObserver class
HBFloaterGroupTitlesObserver::HBFloaterGroupTitlesObserver(HBFloaterGroupTitles* instance, const LLUUID& group_id)
: LLGroupMgrObserver(group_id),
mFloaterInstance(instance)
{
LLGroupMgr::getInstance()->addObserver(this);
}
// virtual
HBFloaterGroupTitlesObserver::~HBFloaterGroupTitlesObserver()
{
LLGroupMgr::getInstance()->removeObserver(this);
}
// virtual
void HBFloaterGroupTitlesObserver::changed(LLGroupChange gc)
{
if (gc == GC_TITLES)
{
update_titles_list(mFloaterInstance);
}
}
// HBFloaterGroupTitles class
HBFloaterGroupTitles::HBFloaterGroupTitles()
: LLFloater(std::string("group titles")),
mFirstUse(true)
{
LLUICtrlFactory::getInstance()->buildFloater(this, "floater_group_titles.xml", NULL);
sInstance = this;
}
// virtual
HBFloaterGroupTitles::~HBFloaterGroupTitles()
{
while (!mObservers.empty())
{
HBFloaterGroupTitlesObserver* observer = mObservers.back();
delete observer;
mObservers.pop_back();
}
sInstance = NULL;
}
// static
void HBFloaterGroupTitles::toggle()
{
// I hate things that don't toggle -- MC
if (!sInstance)
{
sInstance = new HBFloaterGroupTitles();
sInstance->setFocus(TRUE);
sInstance->open();
}
else
{
if (sInstance->getVisible())
{
sInstance->close();
}
else
{
sInstance->open();
}
}
}
BOOL HBFloaterGroupTitles::postBuild()
{
mTitlesList = getChild<LLScrollListCtrl>("titles_list");
if (!mTitlesList)
{
return FALSE;
}
mTitlesList->setCallbackUserData(this);
mTitlesList->setDoubleClickCallback(onActivate);
childSetAction("activate", onActivate, this);
update_titles_list(this);
return TRUE;
}
// static
void HBFloaterGroupTitles::onActivate(void* userdata)
{
HBFloaterGroupTitles* self = (HBFloaterGroupTitles*) userdata;
LLScrollListItem *item = self->mTitlesList->getFirstSelected();
if (!item) return;
// Set the group if needed.
LLUUID old_group_id = gAgent.getGroupID();
LLUUID group_id = item->getColumn(LIST_GROUP_ID)->getValue().asUUID();
if (group_id != old_group_id)
{
LLMessageSystem* msg = gMessageSystem;
msg->newMessageFast(_PREHASH_ActivateGroup);
msg->nextBlockFast(_PREHASH_AgentData);
msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
msg->addUUIDFast(_PREHASH_GroupID, group_id);
gAgent.sendReliableMessage();
}
// Set the title
LLGroupMgr::getInstance()->sendGroupTitleUpdate(group_id, item->getUUID());
// Force a refresh via the observer
if (group_id == LLUUID::null)
{
group_id = old_group_id;
}
LLGroupMgr::getInstance()->sendGroupTitlesRequest(group_id);
}
void update_titles_list(HBFloaterGroupTitles* self)
{
S32 i;
S32 count = gAgent.mGroups.count();
LLUUID id;
LLUUID highlight_id = LLUUID::null;
LLUUID current_group_id = gAgent.getGroupID();
std::vector<LLGroupTitle>::const_iterator citer;
std::string style;
LLGroupData* group_datap;
LLGroupMgrGroupData* gmgr_datap;
if (!self || !self->mTitlesList) return;
LLCtrlListInterface *title_list = self->mTitlesList->getListInterface();
self->mTitlesList->deleteAllItems();
for (i = 0; i < count; ++i)
{
group_datap = &gAgent.mGroups.get(i);
id = group_datap->mID;
if (self->mFirstUse)
{
HBFloaterGroupTitlesObserver* observer = new HBFloaterGroupTitlesObserver(self, id);
self->mObservers.push_back(observer);
}
gmgr_datap = LLGroupMgr::getInstance()->getGroupData(id);
if (!gmgr_datap)
{
LLGroupMgr::getInstance()->sendGroupTitlesRequest(id);
continue;
}
for (citer = gmgr_datap->mTitles.begin(); citer != gmgr_datap->mTitles.end(); citer++)
{
style = "NORMAL";
if (current_group_id == id && citer->mSelected)
{
style = "BOLD";
highlight_id = citer->mRoleID;
}
LLSD element;
element["id"] = citer->mRoleID;
element["columns"][LIST_TITLE]["column"] = "title";
element["columns"][LIST_TITLE]["value"] = citer->mTitle;
element["columns"][LIST_TITLE]["font-style"] = style;
element["columns"][LIST_GROUP_NAME]["column"] = "group_name";
element["columns"][LIST_GROUP_NAME]["value"] = group_datap->mName;
element["columns"][LIST_GROUP_NAME]["font-style"] = style;
element["columns"][LIST_GROUP_ID]["column"] = "group_id";
element["columns"][LIST_GROUP_ID]["value"] = id;
title_list->addElement(element, ADD_SORTED);
}
}
// add "none" to list at top
{
style = "NORMAL";
if (current_group_id.isNull())
{
style = "BOLD";
}
LLSD element;
element["id"] = LLUUID::null;
element["columns"][LIST_TITLE]["column"] = "title";
element["columns"][LIST_TITLE]["value"] = "none";
element["columns"][LIST_TITLE]["font-style"] = style;
element["columns"][LIST_GROUP_NAME]["column"] = "group_name";
element["columns"][LIST_GROUP_NAME]["value"] = "none";
element["columns"][LIST_GROUP_NAME]["font-style"] = style;
element["columns"][LIST_GROUP_ID]["column"] = "group_id";
element["columns"][LIST_GROUP_ID]["value"] = LLUUID::null;
title_list->addElement(element, ADD_TOP);
}
title_list->selectByValue(highlight_id);
self->mFirstUse = false;
}

82
indra/newview/hbfloatergrouptitles.h Normal file
View File

@@ -0,0 +1,82 @@
/**
* @file hbfloatergrouptitles.h
* @brief HBFloaterGroupTitles class definition
*
* This class implements a floater where all available group titles are
* listed, allowing the user to activate any via simple double-click.
*
* $LicenseInfo:firstyear=2010&license=viewergpl$
*
* Copyright (c) 2010, Henri Beauchamp.
*
* Second Life Viewer Source Code
* The source code in this file ("Source Code") is provided by Linden Lab
* to you under the terms of the GNU General Public License, version 2.0
* ("GPL"), unless you have obtained a separate licensing agreement
* ("Other License"), formally executed by you and Linden Lab. Terms of
* the GPL can be found in doc/GPL-license.txt in this distribution, or
* online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
*
* There are special exceptions to the terms and conditions of the GPL as
* it is applied to this Source Code. View the full text of the exception
* in the file doc/FLOSS-exception.txt in this software distribution, or
* online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
*
* By copying, modifying or distributing this software, you acknowledge
* that you have read and understood your obligations described above,
* and agree to abide by those obligations.
*
* ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
* COMPLETENESS OR PERFORMANCE.
* $/LicenseInfo$
*/
#ifndef LL_HBFLOATERGROUPTITLES_H
#define LL_HBFLOATERGROUPTITLES_H
#include "llfloater.h"
#include "llgroupmgr.h"
#include "llscrolllistctrl.h"
enum TITLES_COLUMN_ORDER
{
LIST_TITLE,
LIST_GROUP_NAME,
LIST_GROUP_ID
};
class HBFloaterGroupTitles;
class HBFloaterGroupTitlesObserver : public LLGroupMgrObserver
{
public:
HBFloaterGroupTitlesObserver(HBFloaterGroupTitles* instance, const LLUUID& group_id);
/* virtual */ ~HBFloaterGroupTitlesObserver();
/* virtual */ void changed(LLGroupChange gc);
private:
HBFloaterGroupTitles* mFloaterInstance;
};
class HBFloaterGroupTitles : public LLFloater
{
public:
HBFloaterGroupTitles();
virtual ~HBFloaterGroupTitles();
static void toggle();
BOOL postBuild();
bool mFirstUse;
LLScrollListCtrl* mTitlesList;
std::vector<HBFloaterGroupTitlesObserver*> mObservers;
private:
static void onActivate(void* data);
static HBFloaterGroupTitles* sInstance;
};
#endif

2
indra/newview/llao.cpp
View File

@@ -371,9 +371,7 @@ void LLFloaterAO::addAnimations()
std::string none_text = getString("none_text");
mAnimListCombo->add(none_text, LLUUID::null);
// Add all the default (legacy) animations
S32 i;
// Get all inventory items that are animations
LLViewerInventoryCategory::cat_array_t cats;
LLViewerInventoryItem::item_array_t items;

479
indra/newview/llpreviewanim.cpp
View File

@@ -44,10 +44,10 @@
#include "lllineeditor.h"
#include "lluictrlfactory.h"
#include "lluictrlfactory.h"
// <edit>
#include "llviewerwindow.h" // for alert
#include "llappviewer.h" // gStaticVFS
// </edit>
// <edit>
#include "llviewerwindow.h" // for alert
#include "llappviewer.h" // gStaticVFS
// </edit>
extern LLAgent gAgent;
@@ -58,9 +58,6 @@ LLPreviewAnim::LLPreviewAnim(const std::string& name, const LLRect& rect, const
childSetAction("Anim play btn",playAnim,this);
childSetAction("Anim audition btn",auditionAnim,this);
// <edit>
childSetAction("Anim copy uuid btn", copyAnimID, this);
// </edit>
const LLInventoryItem* item = getItem();
@@ -188,240 +185,240 @@ void LLPreviewAnim::auditionAnim( void *userdata )
}
}
// <edit>
// static
/*
void LLPreviewAnim::copyAnim(void *userdata)
{
LLPreviewAnim* self = (LLPreviewAnim*) userdata;
const LLInventoryItem *item = self->getItem();
if(item)
{
// Some animations aren't hosted on the servers
// I guess they're in this static vfs thing
bool static_vfile = false;
LLVFile* anim_file = new LLVFile(gStaticVFS, item->getAssetUUID(), LLAssetType::AT_ANIMATION);
if (anim_file && anim_file->getSize())
{
//S32 anim_file_size = anim_file->getSize();
//U8* anim_data = new U8[anim_file_size];
//if(anim_file->read(anim_data, anim_file_size))
//{
// static_vfile = true;
//}
static_vfile = true; // for method 2
LLPreviewAnim::gotAssetForCopy(gStaticVFS, item->getAssetUUID(), LLAssetType::AT_ANIMATION, self, 0, 0);
}
delete anim_file;
anim_file = NULL;
if(!static_vfile)
{
// Get it from the servers
gAssetStorage->getAssetData(item->getAssetUUID(), LLAssetType::AT_ANIMATION, LLPreviewAnim::gotAssetForCopy, self, TRUE);
}
}
}
struct LLSaveInfo
{
LLSaveInfo(const LLUUID& item_id, const LLUUID& object_id, const std::string& desc,
const LLTransactionID tid)
: mItemUUID(item_id), mObjectUUID(object_id), mDesc(desc), mTransactionID(tid)
{
}
LLUUID mItemUUID;
LLUUID mObjectUUID;
std::string mDesc;
LLTransactionID mTransactionID;
};
// static
void LLPreviewAnim::gotAssetForCopy(LLVFS *vfs,
const LLUUID& asset_uuid,
LLAssetType::EType type,
void* user_data, S32 status, LLExtStat ext_status)
{
LLPreviewAnim* self = (LLPreviewAnim*) user_data;
//const LLInventoryItem *item = self->getItem();
LLVFile file(vfs, asset_uuid, type, LLVFile::READ);
S32 size = file.getSize();
char* buffer = new char[size];
if (buffer == NULL)
{
llerrs << "Memory Allocation Failed" << llendl;
return;
}
file.read((U8*)buffer, size);
// Write it back out...
LLTransactionID tid;
LLAssetID asset_id;
tid.generate();
asset_id = tid.makeAssetID(gAgent.getSecureSessionID());
LLVFile ofile(gVFS, asset_id, LLAssetType::AT_ANIMATION, LLVFile::APPEND);
ofile.setMaxSize(size);
ofile.write((U8*)buffer, size);
// Upload that asset to the database
LLSaveInfo* info = new LLSaveInfo(self->mItemUUID, self->mObjectUUID, "animation", tid);
gAssetStorage->storeAssetData(tid, LLAssetType::AT_ANIMATION, onSaveCopyComplete, info, FALSE);
delete[] buffer;
buffer = NULL;
}
// static
void LLPreviewAnim::onSaveCopyComplete(const LLUUID& asset_uuid, void* user_data, S32 status, LLExtStat ext_status)
{
LLSaveInfo* info = (LLSaveInfo*)user_data;
if (status == 0)
{
std::string item_name = "New Animation";
std::string item_desc = "";
// Saving into user inventory
LLViewerInventoryItem* item;
item = (LLViewerInventoryItem*)gInventory.getItem(info->mItemUUID);
if(item)
{
item_name = item->getName();
item_desc = item->getDescription();
}
gMessageSystem->newMessageFast(_PREHASH_CreateInventoryItem);
gMessageSystem->nextBlockFast(_PREHASH_AgentData);
gMessageSystem->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
gMessageSystem->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
gMessageSystem->nextBlockFast(_PREHASH_InventoryBlock);
gMessageSystem->addU32Fast(_PREHASH_CallbackID, 0);
gMessageSystem->addUUIDFast(_PREHASH_FolderID, LLUUID::null);
gMessageSystem->addUUIDFast(_PREHASH_TransactionID, info->mTransactionID);
gMessageSystem->addU32Fast(_PREHASH_NextOwnerMask, 2147483647);
gMessageSystem->addS8Fast(_PREHASH_Type, LLAssetType::AT_ANIMATION);
gMessageSystem->addS8Fast(_PREHASH_InvType, LLInventoryType::IT_ANIMATION);
gMessageSystem->addU8Fast(_PREHASH_WearableType, 0);
gMessageSystem->addStringFast(_PREHASH_Name, item_name);
gMessageSystem->addStringFast(_PREHASH_Description, item_desc);
gMessageSystem->sendReliable(gAgent.getRegionHost());
}
else
{
llwarns << "Problem saving animation: " << status << llendl;
LLStringUtil::format_map_t args;
args["[REASON]"] = std::string(LLAssetStorage::getErrorString(status));
gViewerWindow->alertXml("CannotUploadReason",args);
}
}
*/
void LLPreviewAnim::copyAnimID(void *userdata)
{
LLPreviewAnim* self = (LLPreviewAnim*) userdata;
const LLInventoryItem *item = self->getItem();
if(item)
{
gViewerWindow->mWindow->copyTextToClipboard(utf8str_to_wstring(item->getAssetUUID().asString()));
}
}
// </edit>
// <edit>
// virtual
BOOL LLPreviewAnim::canSaveAs() const
{
return TRUE;
}
// virtual
void LLPreviewAnim::saveAs()
{
const LLInventoryItem *item = getItem();
if(item)
{
// Some animations aren't hosted on the servers
// I guess they're in this static vfs thing
bool static_vfile = false;
LLVFile* anim_file = new LLVFile(gStaticVFS, item->getAssetUUID(), LLAssetType::AT_ANIMATION);
if (anim_file && anim_file->getSize())
{
//S32 anim_file_size = anim_file->getSize();
//U8* anim_data = new U8[anim_file_size];
//if(anim_file->read(anim_data, anim_file_size))
//{
// static_vfile = true;
//}
static_vfile = true; // for method 2
LLPreviewAnim::gotAssetForSave(gStaticVFS, item->getAssetUUID(), LLAssetType::AT_ANIMATION, this, 0, 0);
}
delete anim_file;
anim_file = NULL;
if(!static_vfile)
{
gAssetStorage->getAssetData(item->getAssetUUID(), LLAssetType::AT_ANIMATION, LLPreviewAnim::gotAssetForSave, this, TRUE);
}
}
}
// static
void LLPreviewAnim::gotAssetForSave(LLVFS *vfs,
const LLUUID& asset_uuid,
LLAssetType::EType type,
void* user_data, S32 status, LLExtStat ext_status)
{
LLPreviewAnim* self = (LLPreviewAnim*) user_data;
//const LLInventoryItem *item = self->getItem();
LLVFile file(vfs, asset_uuid, type, LLVFile::READ);
S32 size = file.getSize();
char* buffer = new char[size];
if (buffer == NULL)
{
llerrs << "Memory Allocation Failed" << llendl;
return;
}
file.read((U8*)buffer, size);
// Write it back out...
LLFilePicker& file_picker = LLFilePicker::instance();
if( !file_picker.getSaveFile( LLFilePicker::FFSAVE_ANIMATN, LLDir::getScrubbedFileName(self->getItem()->getName())) )
{
// User canceled or we failed to acquire save file.
return;
}
// remember the user-approved/edited file name.
std::string filename = file_picker.getFirstFile();
std::ofstream export_file(filename.c_str(), std::ofstream::binary);
export_file.write(buffer, size);
export_file.close();
delete[] buffer;
buffer = NULL;
}
// virtual
LLUUID LLPreviewAnim::getItemID()
{
const LLViewerInventoryItem* item = getItem();
if(item)
{
return item->getUUID();
}
return LLUUID::null;
}
// <edit>
// static
/*
void LLPreviewAnim::copyAnim(void *userdata)
{
LLPreviewAnim* self = (LLPreviewAnim*) userdata;
const LLInventoryItem *item = self->getItem();
if(item)
{
// Some animations aren't hosted on the servers
// I guess they're in this static vfs thing
bool static_vfile = false;
LLVFile* anim_file = new LLVFile(gStaticVFS, item->getAssetUUID(), LLAssetType::AT_ANIMATION);
if (anim_file && anim_file->getSize())
{
//S32 anim_file_size = anim_file->getSize();
//U8* anim_data = new U8[anim_file_size];
//if(anim_file->read(anim_data, anim_file_size))
//{
// static_vfile = true;
//}
static_vfile = true; // for method 2
LLPreviewAnim::gotAssetForCopy(gStaticVFS, item->getAssetUUID(), LLAssetType::AT_ANIMATION, self, 0, 0);
}
delete anim_file;
anim_file = NULL;
if(!static_vfile)
{
// Get it from the servers
gAssetStorage->getAssetData(item->getAssetUUID(), LLAssetType::AT_ANIMATION, LLPreviewAnim::gotAssetForCopy, self, TRUE);
}
}
}
struct LLSaveInfo
{
LLSaveInfo(const LLUUID& item_id, const LLUUID& object_id, const std::string& desc,
const LLTransactionID tid)
: mItemUUID(item_id), mObjectUUID(object_id), mDesc(desc), mTransactionID(tid)
{
}
LLUUID mItemUUID;
LLUUID mObjectUUID;
std::string mDesc;
LLTransactionID mTransactionID;
};
// static
void LLPreviewAnim::gotAssetForCopy(LLVFS *vfs,
const LLUUID& asset_uuid,
LLAssetType::EType type,
void* user_data, S32 status, LLExtStat ext_status)
{
LLPreviewAnim* self = (LLPreviewAnim*) user_data;
//const LLInventoryItem *item = self->getItem();
LLVFile file(vfs, asset_uuid, type, LLVFile::READ);
S32 size = file.getSize();
char* buffer = new char[size];
if (buffer == NULL)
{
llerrs << "Memory Allocation Failed" << llendl;
return;
}
file.read((U8*)buffer, size);
// Write it back out...
LLTransactionID tid;
LLAssetID asset_id;
tid.generate();
asset_id = tid.makeAssetID(gAgent.getSecureSessionID());
LLVFile ofile(gVFS, asset_id, LLAssetType::AT_ANIMATION, LLVFile::APPEND);
ofile.setMaxSize(size);
ofile.write((U8*)buffer, size);
// Upload that asset to the database
LLSaveInfo* info = new LLSaveInfo(self->mItemUUID, self->mObjectUUID, "animation", tid);
gAssetStorage->storeAssetData(tid, LLAssetType::AT_ANIMATION, onSaveCopyComplete, info, FALSE);
delete[] buffer;
buffer = NULL;
}
// static
void LLPreviewAnim::onSaveCopyComplete(const LLUUID& asset_uuid, void* user_data, S32 status, LLExtStat ext_status)
{
LLSaveInfo* info = (LLSaveInfo*)user_data;
if (status == 0)
{
std::string item_name = "New Animation";
std::string item_desc = "";
// Saving into user inventory
LLViewerInventoryItem* item;
item = (LLViewerInventoryItem*)gInventory.getItem(info->mItemUUID);
if(item)
{
item_name = item->getName();
item_desc = item->getDescription();
}
gMessageSystem->newMessageFast(_PREHASH_CreateInventoryItem);
gMessageSystem->nextBlockFast(_PREHASH_AgentData);
gMessageSystem->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
gMessageSystem->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
gMessageSystem->nextBlockFast(_PREHASH_InventoryBlock);
gMessageSystem->addU32Fast(_PREHASH_CallbackID, 0);
gMessageSystem->addUUIDFast(_PREHASH_FolderID, LLUUID::null);
gMessageSystem->addUUIDFast(_PREHASH_TransactionID, info->mTransactionID);
gMessageSystem->addU32Fast(_PREHASH_NextOwnerMask, 2147483647);
gMessageSystem->addS8Fast(_PREHASH_Type, LLAssetType::AT_ANIMATION);
gMessageSystem->addS8Fast(_PREHASH_InvType, LLInventoryType::IT_ANIMATION);
gMessageSystem->addU8Fast(_PREHASH_WearableType, 0);
gMessageSystem->addStringFast(_PREHASH_Name, item_name);
gMessageSystem->addStringFast(_PREHASH_Description, item_desc);
gMessageSystem->sendReliable(gAgent.getRegionHost());
}
else
{
llwarns << "Problem saving animation: " << status << llendl;
LLStringUtil::format_map_t args;
args["[REASON]"] = std::string(LLAssetStorage::getErrorString(status));
gViewerWindow->alertXml("CannotUploadReason",args);
}
}
*/
void LLPreviewAnim::copyAnimID(void *userdata)
{
LLPreviewAnim* self = (LLPreviewAnim*) userdata;
const LLInventoryItem *item = self->getItem();
if(item)
{
gViewerWindow->mWindow->copyTextToClipboard(utf8str_to_wstring(item->getAssetUUID().asString()));
}
}
// </edit>
// <edit>
// virtual
BOOL LLPreviewAnim::canSaveAs() const
{
return TRUE;
}
// virtual
void LLPreviewAnim::saveAs()
{
const LLInventoryItem *item = getItem();
if(item)
{
// Some animations aren't hosted on the servers
// I guess they're in this static vfs thing
bool static_vfile = false;
LLVFile* anim_file = new LLVFile(gStaticVFS, item->getAssetUUID(), LLAssetType::AT_ANIMATION);
if (anim_file && anim_file->getSize())
{
//S32 anim_file_size = anim_file->getSize();
//U8* anim_data = new U8[anim_file_size];
//if(anim_file->read(anim_data, anim_file_size))
//{
// static_vfile = true;
//}
static_vfile = true; // for method 2
LLPreviewAnim::gotAssetForSave(gStaticVFS, item->getAssetUUID(), LLAssetType::AT_ANIMATION, this, 0, 0);
}
delete anim_file;
anim_file = NULL;
if(!static_vfile)
{
gAssetStorage->getAssetData(item->getAssetUUID(), LLAssetType::AT_ANIMATION, LLPreviewAnim::gotAssetForSave, this, TRUE);
}
}
}
// static
void LLPreviewAnim::gotAssetForSave(LLVFS *vfs,
const LLUUID& asset_uuid,
LLAssetType::EType type,
void* user_data, S32 status, LLExtStat ext_status)
{
LLPreviewAnim* self = (LLPreviewAnim*) user_data;
//const LLInventoryItem *item = self->getItem();
LLVFile file(vfs, asset_uuid, type, LLVFile::READ);
S32 size = file.getSize();
char* buffer = new char[size];
if (buffer == NULL)
{
llerrs << "Memory Allocation Failed" << llendl;
return;
}
file.read((U8*)buffer, size);
// Write it back out...
LLFilePicker& file_picker = LLFilePicker::instance();
if( !file_picker.getSaveFile( LLFilePicker::FFSAVE_ANIMATN, LLDir::getScrubbedFileName(self->getItem()->getName())) )
{
// User canceled or we failed to acquire save file.
return;
}
// remember the user-approved/edited file name.
std::string filename = file_picker.getFirstFile();
std::ofstream export_file(filename.c_str(), std::ofstream::binary);
export_file.write(buffer, size);
export_file.close();
delete[] buffer;
buffer = NULL;
}
// virtual
LLUUID LLPreviewAnim::getItemID()
{
const LLViewerInventoryItem* item = getItem();
if(item)
{
return item->getUUID();
}
return LLUUID::null;
}
// </edit>
void LLPreviewAnim::onClose(bool app_quitting)

37
indra/newview/llvoavatar.cpp
View File

@@ -5901,16 +5901,40 @@ BOOL LLVOAvatar::startMotion(const LLUUID& id, F32 time_offset)
{
gAgent.sendAnimationRequest(LLAO::mLastAnimation, ANIM_REQUEST_STOP);
stopMotion(LLAO::mLastAnimation, true);
llinfos << "Stopping old animation." << llendl;
}
LLAO::mAnimationIndex++;
if (LLAO::mAnimationOverrides[ao_id].size() <= LLAO::mAnimationIndex)
std::string anim_name;
LLUUID new_anim = LLUUID::null;
while (new_anim.isNull())
{
LLAO::mAnimationIndex = 0;
LLAO::mAnimationIndex++;
if (LLAO::mAnimationOverrides[ao_id].size() <= LLAO::mAnimationIndex)
{
LLAO::mAnimationIndex = 0;
}
anim_name = LLAO::mAnimationOverrides[ao_id][LLAO::mAnimationIndex];
new_anim = LLAO::getAssetIDByName(anim_name);
if (new_anim.isNull())
{
LLChat chat;
chat.mSourceType = CHAT_SOURCE_SYSTEM;
chat.mText = llformat("Could not find animation %s, skipping and moving to next.", anim_name);
LLFloaterChat::addChat(chat);
}
}
LLUUID new_anim = LLAO::getAssetIDByName(LLAO::mAnimationOverrides[ao_id][LLAO::mAnimationIndex]);
llinfos << "Switching to anim #" << LLAO::mAnimationIndex << ": " << LLAO::mAnimationOverrides[ao_id][LLAO::mAnimationIndex] << llendl;
llinfos << "Switching to anim #" << LLAO::mAnimationIndex << ": " << anim_name << "(UUID " << new_anim << ")" << llendl;
gAgent.sendAnimationRequest(new_anim, ANIM_REQUEST_START);
startMotion(new_anim, time_offset);
//LLMotion* motion = findMotion(new_anim);
/*if (motion)
{
motion->setDeactivateCallback(&endAnimCallback, (void *)(new LLHandle<LLFloater>(self->getHandle())));
}*/
LLAO::mLastAnimation = new_anim;
}
/*if(LLAO::mOverrides.find(id) != LLAO::mOverrides.end())
@@ -6019,8 +6043,9 @@ BOOL LLVOAvatar::stopMotion(const LLUUID& id, BOOL stop_immediate)
}
else //if this code ever works without crashing the viewer -HgB
{
if (LLAO::mLastAnimation != LLUUID::null)
if (!LLAO::mLastAnimation.isNull())
{
llinfos << "Stopped last animation automatically. May not have needed to be stopped yet." << llendl;
gAgent.sendAnimationRequest(LLAO::mLastAnimation, ANIM_REQUEST_STOP);
LLAO::mLastAnimation = LLUUID::null;
}