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

Could optimize this I guess...

meow-7.2.2
Ansariel 2022-08-14 14:22:28 +02:00
parent 69b2092963
commit 593e9f139d
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/chatbar_as_cmdline.cpp
View File

@ -74,7 +74,7 @@ LLUUID cmd_line_mPackagerDest;
LLViewerInventoryItem::item_array_t findInventoryInFolder(std::string_view ifolder)
{
LLUUID folder = gInventory.findCategoryByName(ifolder.data());
LLUUID folder = gInventory.findCategoryByName(static_cast<std::string>(ifolder));
LLViewerInventoryCategory::cat_array_t cats;
LLViewerInventoryItem::item_array_t items;
gInventory.collectDescendents(folder, cats, items, FALSE);
@ -565,7 +565,7 @@ bool cmd_line_chat(std::string_view revised_text, EChatType type, bool from_gest
if (sFSCmdLine)
{
std::istringstream i(revised_text.data());
std::istringstream i(static_cast<std::string>(revised_text));
std::string command;
i >> command;
if (!command.empty())
@ -938,7 +938,7 @@ bool cmd_line_chat(std::string_view revised_text, EChatType type, bool from_gest
}
else
{
region_name = LLWeb::escapeURL(revised_text.substr(command.length() + 1).data());
region_name = LLWeb::escapeURL(static_cast<std::string>(revised_text.substr(command.length() + 1)));
LLVector3d agentPos = gAgent.getPositionGlobal();
agent_x = ll_round((F32)agentPos.mdV[VX]);
agent_y = ll_round((F32)agentPos.mdV[VY]);
@ -963,7 +963,7 @@ bool cmd_line_chat(std::string_view revised_text, EChatType type, bool from_gest
F32 result = 0.f;
if (revised_text.length() > command.length() + 1)
{
std::string expr = revised_text.substr(command.length() + 1).data();
std::string expr = static_cast<std::string>(revised_text.substr(command.length() + 1));
LLStringUtil::toUpper(expr);
std::string original_expr = expr;
@ -1748,7 +1748,7 @@ LLUUID cmdline_partial_name2key(std::string partial_name)
void cmdline_tp2name(std::string_view target)
{
LLUUID avkey = cmdline_partial_name2key(target.data());
LLUUID avkey = cmdline_partial_name2key(static_cast<std::string>(target));
if (avkey.notNull() && avkey != gAgentID)
{
LLAvatarActions::teleportTo(avkey);
@ -1860,7 +1860,7 @@ bool cmdline_packager(std::string_view message, const LLUUID& fromID, const LLUU
}
while(comma < csv.length());
report_to_nearby_chat(llformat("Packager: adding objects: \"%s\"", csv.data()));
report_to_nearby_chat(llformat("Packager: adding objects: \"%s\"", static_cast<std::string>(csv).c_str()));
return true;
}
else if (cmd == "kpackagerend") {

10
indra/newview/fscommon.cpp
View File

@ -67,7 +67,7 @@ extern S32 gMaxAgentGroups;
S32 FSCommon::sObjectAddMsg = 0;
void report_to_nearby_chat(const std::string& message)
void report_to_nearby_chat(std::string_view message)
{
LLChat chat;
chat.mText = message;
@ -81,16 +81,16 @@ std::string format_string(std::string text, const LLStringUtil::format_map_t& ar
return text;
}
bool is_irc_me_prefix(const std::string& text)
bool is_irc_me_prefix(std::string_view text)
{
const std::string prefix = text.substr(0, 4);
const std::string_view prefix = text.substr(0, 4);
return (prefix == "/me " || prefix == "/me'");
}
std::string unescape_name(const std::string& name)
std::string unescape_name(std::string_view name)
{
// bugfix for SL-46920: preventing filenames that break stuff.
char * curl_str = curl_unescape(name.c_str(), name.size());
char * curl_str = curl_unescape(name.data(), name.size()); // Calling data() should be ok here because we also pass the length
std::string unescaped_name(curl_str);
curl_free(curl_str);
curl_str = NULL;

6
indra/newview/fscommon.h
View File

@ -37,10 +37,10 @@ class LLViewerParcelMgr;
const F64 AVATAR_UNKNOWN_Z_OFFSET = -1.0; // Const value for avatars at unknown height
const F32 AVATAR_UNKNOWN_RANGE = -1.f;
void report_to_nearby_chat(const std::string& message);
void report_to_nearby_chat(std::string_view message);
std::string format_string(std::string text, const LLStringUtil::format_map_t& args);
bool is_irc_me_prefix(const std::string& text);
std::string unescape_name(const std::string& name);
bool is_irc_me_prefix(std::string_view text);
std::string unescape_name(std::string_view name);
namespace FSCommon
{