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

Minor compile fixes: move a declaration out of a namespace, add an include

Browse Source
This commit is contained in:
Router Gray
2020-03-23 11:47:17 -05:00
parent 8c6e6143c2
commit a9b047b168
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
indra/newview/llfloateravatarlist.cpp
View File

@@ -360,6 +360,8 @@ static void cmd_toggle_mark(LLAvatarListEntry* entry)
static void cmd_ar(const LLAvatarListEntry* entry); static void cmd_ar(const LLAvatarListEntry* entry);
static void cmd_teleport(const LLAvatarListEntry* entry); static void cmd_teleport(const LLAvatarListEntry* entry);
const LLUUID& active_owner_or_id(const LLSD& userdata);
namespace namespace
{ {
typedef LLMemberListener<LLView> view_listener_t; typedef LLMemberListener<LLView> view_listener_t;
@@ -376,7 +378,6 @@ namespace
{ {
bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata) override 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)); LLFloaterAvatarList::setFocusAvatar(active_owner_or_id(userdata));
return true; return true;
} }

1
indra/newview/llmeshrepository.cpp
View File

@@ -66,6 +66,7 @@
#include "lluploadfloaterobservers.h" #include "lluploadfloaterobservers.h"
#include "aicurl.h" #include "aicurl.h"
#include <mutex>
#include "boost/lexical_cast.hpp" #include "boost/lexical_cast.hpp"
#ifndef LL_WINDOWS #ifndef LL_WINDOWS