HonK hOnk hoNK

Signed-off-by: Beeks <HgDelirium@gmail.com>

indra/newview/hbfloatergrouptitles.cpp

@@ -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;
+}

indra/newview/hbfloatergrouptitles.h

@@ -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

indra/newview/llao.cpp

@@ -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;

indra/newview/llpreviewanim.cpp

@@ -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();
 	

indra/newview/llvoavatar.cpp

@@ -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;
 			}