Merge branch 'master' of https://github.com/RouterGray/SingularityViewer
This commit is contained in:
@@ -365,6 +365,8 @@ static void cmd_toggle_mark(LLAvatarListEntry* entry)
|
||||
static void cmd_ar(const LLAvatarListEntry* entry);
|
||||
static void cmd_teleport(const LLAvatarListEntry* entry);
|
||||
|
||||
const LLUUID& active_owner_or_id(const LLSD& userdata);
|
||||
|
||||
namespace
|
||||
{
|
||||
typedef LLMemberListener<LLView> view_listener_t;
|
||||
@@ -381,7 +383,6 @@ namespace
|
||||
{
|
||||
bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata) override
|
||||
{
|
||||
const LLUUID& active_owner_or_id(const LLSD& userdata);
|
||||
LLFloaterAvatarList::setFocusAvatar(active_owner_or_id(userdata));
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -65,6 +65,7 @@
|
||||
#include "lluploadfloaterobservers.h"
|
||||
#include "aicurl.h"
|
||||
|
||||
#include <mutex>
|
||||
#include "boost/lexical_cast.hpp"
|
||||
|
||||
#ifndef LL_WINDOWS
|
||||
|
||||
Reference in New Issue
Block a user