livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some refactoring of FSData

Ansariel 2014-09-25 01:29:26 +02:00
parent 886ed3ce3e
commit b4d0e5ec08
2 changed files with 31 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
indra/newview/fsdata.cpp
View File

@ -579,12 +579,19 @@ void FSData::processClientTags(const LLSD& tags)
}
//WS: Create a new LLSD based on the data from the mLegacyClientList if
LLSD FSData::resolveClientTag(LLUUID id, bool new_system, LLColor4 color)
LLSD FSData::resolveClientTag(const LLUUID& id, bool new_system, const LLColor4& color)
{
LLSD curtag;
curtag["uuid"] = id.asString();
curtag["id_based"] = new_system;
curtag["tex_color"] = color.getValue();
static const LLUUID id_singularity("f25263b7-6167-4f34-a4ef-af65213b2e39");
static const LLUUID id_kokua("4b6f6b75-bf77-d1ff-0000-000000000000");
static const LLUUID id_radegast("b748af88-58e2-995b-cf26-9486dea8e830");
static const LLUUID id_imprudence("cc7a030f-282f-c165-44d2-b5ee572e72bf");
static const LLUUID id_teapot("7eab0700-f000-0000-0000-546561706f7");
static const LLUUID id_lindenlab("c228d1cf-4b5d-4ba8-84f4-899a0796aa97");
static LLCachedControl<U32> client_tag_visibility(gSavedSettings, "FSClientTagsVisibility");
static LLCachedControl<U32> use_legacy_client_tags(gSavedSettings, "FSUseLegacyClienttags");
@ -604,29 +611,29 @@ LLSD FSData::resolveClientTag(LLUUID id, bool new_system, LLColor4 color)
}
else
{
if (id == LLUUID("f25263b7-6167-4f34-a4ef-af65213b2e39"))
if (id == id_singularity)
{
curtag["name"] = "Singularity";
}
else if (id == LLUUID("4b6f6b75-bf77-d1ff-0000-000000000000"))
else if (id == id_kokua)
{
curtag["name"] = "Kokua";
}
else if (id == LLUUID("b748af88-58e2-995b-cf26-9486dea8e830"))
else if (id == id_radegast)
{
curtag["name"] = "Radegast";
}
else if (id == LLUUID("cc7a030f-282f-c165-44d2-b5ee572e72bf"))
else if (id == id_imprudence)
{
curtag["name"] = "Imprudence";
}
else if (id == LLUUID("7eab0700-f000-0000-0000-546561706f7"))
else if (id == id_teapot)
{
curtag["name"] = "Teapot";
}
/// [FS:CR] Since SL Viewer can't connect to Opensim, and client tags only work on OpenSim
/// it doesn't make much sense to tag V3-based viewers as SL Viewer.
/*if (id == LLUUID("c228d1cf-4b5d-4ba8-84f4-899a0796aa97"))
/*if (id == id_lindenlab)
{
curtag["name"] = "SL Viewer";
}*/
@ -653,9 +660,9 @@ LLSD FSData::resolveClientTag(LLUUID id, bool new_system, LLColor4 color)
if (color == LLColor4::blue ||
color == LLColor4::yellow ||
color == LLColor4::purple ||
color == LLColor4((F32)0.99,(F32)0.39,(F32)0.12,(F32)1) ||
color == LLColor4(0.99f, 0.39f, 0.12f, 1.f) ||
color == LLColor4::red ||
color == LLColor4((F32)0.99,(F32)0.56,(F32)0.65,(F32)1) ||
color == LLColor4(0.99f, 0.56f, 0.65f, 1.f) ||
color == LLColor4::white ||
color == LLColor4::green)
{
@ -722,7 +729,7 @@ void FSData::saveLLSD(const LLSD& data, const std::string& filename, const LLDat
#endif
}
S32 FSData::getAgentFlags(LLUUID avatar_id)
S32 FSData::getAgentFlags(const LLUUID& avatar_id)
{
std::map<LLUUID, S32>::iterator iter = mSupportAgents.find(avatar_id);
if (iter == mSupportAgents.end())
@ -732,7 +739,7 @@ S32 FSData::getAgentFlags(LLUUID avatar_id)
return iter->second;
}
bool FSData::isSupport(LLUUID avatar_id)
bool FSData::isSupport(const LLUUID& avatar_id)
{
std::map<LLUUID, S32>::iterator iter = mSupportAgents.find(avatar_id);
if (iter == mSupportAgents.end())
@ -742,7 +749,7 @@ bool FSData::isSupport(LLUUID avatar_id)
return (iter->second & SUPPORT);
}
bool FSData::isDeveloper(LLUUID avatar_id)
bool FSData::isDeveloper(const LLUUID& avatar_id)
{
std::map<LLUUID, S32>::iterator iter = mSupportAgents.find(avatar_id);
if (iter == mSupportAgents.end())
@ -795,7 +802,7 @@ LLSD FSData::allowedLogin()
}
}
BOOL FSData::isSupportGroup(LLUUID id)
BOOL FSData::isSupportGroup(const LLUUID& id)
{
return (mSupportGroup.count(id));
}
@ -815,9 +822,9 @@ void FSData::addAgents()
{
if (!gCacheName)
{
return;
return;
}
for (std::map<LLUUID, S32>::iterator iter = mSupportAgents.begin(); iter != mSupportAgents.end(); ++iter)
{
if (iter->second & NO_SPAM)
@ -831,7 +838,7 @@ void FSData::addAgents()
}
}
std::string FSData::processRequestForInfo(LLUUID requester, std::string message, std::string name, LLUUID sessionid)
std::string FSData::processRequestForInfo(const LLUUID& requester, const std::string& message, const std::string& name, const LLUUID& sessionid)
{
std::string detectstring = "/reqsysinfo";
if(!message.find(detectstring) == 0)
@ -865,7 +872,7 @@ std::string FSData::processRequestForInfo(LLUUID requester, std::string message,
}
//static
void FSData::sendInfo(LLUUID destination, LLUUID sessionid, std::string myName, EInstantMessage dialog)
void FSData::sendInfo(const LLUUID& destination, const LLUUID& sessionid, const std::string& myName, EInstantMessage dialog)
{
LLSD system_info = getSystemInfo();
std::string part1 = system_info["Part1"].asString();

14
indra/newview/fsdata.h
View File

@ -43,7 +43,7 @@ public:
void processResponder(const LLSD& content, const std::string& url, bool save_to_file, const LLDate& last_modified);
void addAgents();
LLSD resolveClientTag(LLUUID id, bool new_system, LLColor4 new_system_color);
LLSD resolveClientTag(const LLUUID& id, bool new_system, const LLColor4& new_system_color);
enum flags_t
{
@ -58,17 +58,17 @@ public:
std::set<LLUUID> mSupportGroup;
bool isDeveloper(LLUUID avatar_id);
bool isSupport(LLUUID avatar_id);
BOOL isSupportGroup(LLUUID id); // BOOL is used due to used in a LL function.
bool isDeveloper(const LLUUID& avatar_id);
bool isSupport(const LLUUID& avatar_id);
BOOL isSupportGroup(const LLUUID& id); // BOOL is used due to used in a LL function.
// returns -1 if agent is not found.
S32 getAgentFlags(LLUUID avatar_id);
S32 getAgentFlags(const LLUUID& avatar_id);
LLSD allowedLogin();
bool enableLegacySearch() {return mLegacySearch;}
std::string processRequestForInfo(LLUUID requester,std::string message, std::string name, LLUUID sessionid);
std::string processRequestForInfo(const LLUUID& requester, const std::string& message, const std::string& name, const LLUUID& sessionid);
static LLSD getSystemInfo();
static void callbackReqInfo(const LLSD &notification, const LLSD &response);
@ -80,7 +80,7 @@ public:
private:
static void sendInfo(LLUUID destination, LLUUID sessionid, std::string myName, EInstantMessage dialog);
static void sendInfo(const LLUUID& destination, const LLUUID& sessionid, const std::string& myName, EInstantMessage dialog);
void processAssets(const LLSD& assets);
void processAgents(const LLSD& data);
void saveLLSD(const LLSD& data, const std::string& filename, const LLDate& last_modified);