Skip to content

Commit a9b047b

Browse files
committed
Minor compile fixes: move a declaration out of a namespace, add an include
1 parent 8c6e614 commit a9b047b

2 files changed

Lines changed: 3 additions & 1 deletion

File tree

indra/newview/llfloateravatarlist.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -360,6 +360,8 @@ static void cmd_toggle_mark(LLAvatarListEntry* entry)
360360
static void cmd_ar(const LLAvatarListEntry* entry);
361361
static void cmd_teleport(const LLAvatarListEntry* entry);
362362

363+
const LLUUID& active_owner_or_id(const LLSD& userdata);
364+
363365
namespace
364366
{
365367
typedef LLMemberListener<LLView> view_listener_t;
@@ -376,7 +378,6 @@ namespace
376378
{
377379
bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata) override
378380
{
379-
const LLUUID& active_owner_or_id(const LLSD& userdata);
380381
LLFloaterAvatarList::setFocusAvatar(active_owner_or_id(userdata));
381382
return true;
382383
}

indra/newview/llmeshrepository.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@
6666
#include "lluploadfloaterobservers.h"
6767
#include "aicurl.h"
6868

69+
#include <mutex>
6970
#include "boost/lexical_cast.hpp"
7071

7172
#ifndef LL_WINDOWS

0 commit comments

Comments
 (0)