diff --git a/indra/newview/NACLfloaterexploresounds.cpp b/indra/newview/NACLfloaterexploresounds.cpp index 11499cc29e..e225577e80 100644 --- a/indra/newview/NACLfloaterexploresounds.cpp +++ b/indra/newview/NACLfloaterexploresounds.cpp @@ -234,7 +234,7 @@ BOOL NACLFloaterExploreSounds::tick() { LLStringUtil::format_map_t format_args; format_args["TIME"] = llformat("%.1f", static_cast((LLTimer::getElapsedSeconds() - item.mTimeStopped) / 60.0)); - playing_column["value"] = formatString(str_not_playing, format_args); + playing_column["value"] = format_string(str_not_playing, format_args); } LLSD& type_column = element["columns"][1]; diff --git a/indra/newview/chatbar_as_cmdline.cpp b/indra/newview/chatbar_as_cmdline.cpp index b2b952d0ed..714dfacc14 100644 --- a/indra/newview/chatbar_as_cmdline.cpp +++ b/indra/newview/chatbar_as_cmdline.cpp @@ -102,22 +102,22 @@ public: doZdCleanup(); if (mErrorCode == 1) { - reportToNearbyChat(llformat("The object with the UUID of \"%s\" can no longer be found in-world.", mDropUUID.c_str())); - reportToNearbyChat("This can occur if the object was returned or deleted, or if your client is no longer rendering it."); - reportToNearbyChat(llformat("Transfer from \"%s\" to \"%s\" aborted.", mFolderName.c_str(), mDropUUID.c_str())); + report_to_nearby_chat(llformat("The object with the UUID of \"%s\" can no longer be found in-world.", mDropUUID.c_str())); + report_to_nearby_chat("This can occur if the object was returned or deleted, or if your client is no longer rendering it."); + report_to_nearby_chat(llformat("Transfer from \"%s\" to \"%s\" aborted.", mFolderName.c_str(), mDropUUID.c_str())); } else { if (mPackage) { - reportToNearbyChat("Packager finished, you may now pick up the prim that contains the objects."); - reportToNearbyChat(llformat("Packaged what you had selected in world into the folder \"%s\" in your inventory and into the prim with the UUID of \"%s\"", mFolderName.c_str(), mDropUUID.c_str())); - reportToNearbyChat("Don't worry if you look at the contents of package right now, it may show as empty, it isn't, it's just a bug with Second Life itself."); - reportToNearbyChat("If you take it into your inventory then rez it back out, all the contents will be there."); + report_to_nearby_chat("Packager finished, you may now pick up the prim that contains the objects."); + report_to_nearby_chat(llformat("Packaged what you had selected in world into the folder \"%s\" in your inventory and into the prim with the UUID of \"%s\"", mFolderName.c_str(), mDropUUID.c_str())); + report_to_nearby_chat("Don't worry if you look at the contents of package right now, it may show as empty, it isn't, it's just a bug with Second Life itself."); + report_to_nearby_chat("If you take it into your inventory then rez it back out, all the contents will be there."); } else { - reportToNearbyChat(llformat("Completed transfer from \"%s\" to \"%s\".", mFolderName.c_str(), mDropUUID.c_str())); + report_to_nearby_chat(llformat("Completed transfer from \"%s\" to \"%s\".", mFolderName.c_str(), mDropUUID.c_str())); } } } @@ -129,7 +129,7 @@ public: LLViewerObject* objectp = gObjectList.findObject(mDestination); if (objectp) { - reportToNearbyChat(std::string("transferring ") + subj->getName()); + report_to_nearby_chat(std::string("transferring ") + subj->getName()); LLToolDragAndDrop::dropInventory(objectp, subj, LLToolDragAndDrop::SOURCE_AGENT, gAgentID); if (mStack.size() > 0) { @@ -218,11 +218,11 @@ public: if (mPackage) { - reportToNearbyChat("Packager started. Phase 1 (taking in-world objects into inventory) starting in: "); + report_to_nearby_chat("Packager started. Phase 1 (taking in-world objects into inventory) starting in: "); } else { - reportToNearbyChat("Ztake activated. Taking selected in-world objects into inventory in: "); + report_to_nearby_chat("Ztake activated. Taking selected in-world objects into inventory in: "); } } @@ -230,7 +230,7 @@ public: { if (!mPackage) { - reportToNearbyChat("Ztake deactivated."); + report_to_nearby_chat("Ztake deactivated."); } } @@ -239,7 +239,7 @@ public: { switch (mState) { case ZTS_COUNTDOWN: - reportToNearbyChat(llformat("%i...", mCountdown--)); + report_to_nearby_chat(llformat("%i...", mCountdown--)); if (mCountdown == 0) mState = ZTS_SELECTION; break; @@ -298,25 +298,25 @@ public: } else { - reportToNearbyChat("Ktake has taken all selected objects."); + report_to_nearby_chat("Ktake has taken all selected objects."); doZtCleanup(); mState = ZTS_DONE; } } else { - reportToNearbyChat("Ztake has taken all selected objects. Say \"ztake off\" to deactivate ztake or select more objects to continue."); + report_to_nearby_chat("Ztake has taken all selected objects. Say \"ztake off\" to deactivate ztake or select more objects to continue."); } } else { if (mPackage) { - reportToNearbyChat(llformat("Packager: %i objects left to take.", mToTake.size())); + report_to_nearby_chat(llformat("Packager: %i objects left to take.", mToTake.size())); } else { - reportToNearbyChat(llformat("Ztake: %i objects left to take.", mToTake.size())); + report_to_nearby_chat(llformat("Ztake: %i objects left to take.", mToTake.size())); } } } @@ -325,12 +325,12 @@ public: { if (mPackage) { - reportToNearbyChat(llformat("Packager: no objects to take.")); + report_to_nearby_chat(llformat("Packager: no objects to take.")); doZtCleanup(); } else { - reportToNearbyChat(llformat("Ztake: no objects to take.")); + report_to_nearby_chat(llformat("Ztake: no objects to take.")); } } break; @@ -350,14 +350,14 @@ public: if (itemstack.size() >= mPackSize || mCountdown == 0) { if (itemstack.size() < mPackSize) { - reportToNearbyChat("Phase 1 of the packager finished, but some items mave have been missed."); + report_to_nearby_chat("Phase 1 of the packager finished, but some items mave have been missed."); } else { - reportToNearbyChat("Phase 1 of the packager finished."); + report_to_nearby_chat("Phase 1 of the packager finished."); } - reportToNearbyChat("Do not have the destination prim selected while transfer is running to reduce the chances of \"Inventory creation on in-world object failed.\""); + report_to_nearby_chat("Do not have the destination prim selected while transfer is running to reduce the chances of \"Inventory creation on in-world object failed.\""); LLUUID sdest = LLUUID(mPackageDest); new JCZdrop(itemstack, sdest, mFolderName.c_str(), mPackageDest.asString().c_str(), true); @@ -421,12 +421,12 @@ public: TMZtake(const LLUUID& target) : LLEventTimer(0.33f), mTarget(target), mRunning(FALSE), mCountdown(5) { - reportToNearbyChat("Mtake activated. Taking selected in-world objects into inventory in: "); + report_to_nearby_chat("Mtake activated. Taking selected in-world objects into inventory in: "); } ~TMZtake() { - reportToNearbyChat("Mtake deactivated."); + report_to_nearby_chat("Mtake deactivated."); } BOOL tick() @@ -470,7 +470,7 @@ public: } if (mCountdown > 0) { - reportToNearbyChat(llformat("%i...", mCountdown--)); + report_to_nearby_chat(llformat("%i...", mCountdown--)); } else if (mToTake.size() > 0) { @@ -496,11 +496,11 @@ public: { if (mToTake.size() == 0) { - reportToNearbyChat("Mtake has taken all selected objects. Say \"mtake off\" to deactivate Mtake or select more objects to continue."); + report_to_nearby_chat("Mtake has taken all selected objects. Say \"mtake off\" to deactivate Mtake or select more objects to continue."); } else { - reportToNearbyChat(llformat("Mtake: %i objects left to take.", mToTake.size())); + report_to_nearby_chat(llformat("Mtake: %i objects left to take.", mToTake.size())); } } } @@ -582,7 +582,7 @@ bool cmd_line_chat(const std::string& revised_text, EChatType type, bool from_ge { if (from_gesture) { - reportToNearbyChat(LLTrans::getString("DrawDistanceSteppingGestureObsolete")); + report_to_nearby_chat(LLTrans::getString("DrawDistanceSteppingGestureObsolete")); gSavedSettings.setBOOL("FSRenderFarClipStepping", TRUE); return false; } @@ -593,7 +593,7 @@ bool cmd_line_chat(const std::string& revised_text, EChatType type, bool from_ge gAgentCamera.mDrawDistance = drawDist; LLStringUtil::format_map_t args; args["DISTANCE"] = llformat("%.0f", drawDist); - reportToNearbyChat(LLTrans::getString("FSCmdLineDrawDistanceSet", args)); + report_to_nearby_chat(LLTrans::getString("FSCmdLineDrawDistanceSet", args)); return false; } } @@ -655,7 +655,7 @@ bool cmd_line_chat(const std::string& revised_text, EChatType type, bool from_ge std::string bw_cmd_respond; args["[VALUE]"] = llformat ("%d", band_width); bw_cmd_respond = LLTrans::getString("FSCmdLineRSP", args); - reportToNearbyChat(bw_cmd_respond); + report_to_nearby_chat(bw_cmd_respond); return false; } } @@ -707,7 +707,7 @@ bool cmd_line_chat(const std::string& revised_text, EChatType type, bool from_ge { object_name = RlvStrings::getAnonym(object_name); } - reportToNearbyChat(llformat("%s: (%s)", target_key.asString().c_str(), object_name.c_str())); + report_to_nearby_chat(llformat("%s: (%s)", target_key.asString().c_str(), object_name.c_str())); } return false; } @@ -720,7 +720,7 @@ bool cmd_line_chat(const std::string& revised_text, EChatType type, bool from_ge if (!myObject) { - reportToNearbyChat(llformat("Object with key %s not found!", target_key.asString().c_str())); + report_to_nearby_chat(llformat("Object with key %s not found!", target_key.asString().c_str())); return false; } @@ -760,7 +760,7 @@ bool cmd_line_chat(const std::string& revised_text, EChatType type, bool from_ge msg->addVector3("Normal", LLVector3::zero); msg->addVector3("Binormal", LLVector3::zero); msg->sendMessage(myObject->getRegion()->getHost()); - reportToNearbyChat(llformat("Touched object with key %s", target_key.asString().c_str())); + report_to_nearby_chat(llformat("Touched object with key %s", target_key.asString().c_str())); } } return false; @@ -774,7 +774,7 @@ bool cmd_line_chat(const std::string& revised_text, EChatType type, bool from_ge if (!myObject) { - reportToNearbyChat(llformat("Object with key %s not found!", target_key.asString().c_str())); + report_to_nearby_chat(llformat("Object with key %s not found!", target_key.asString().c_str())); return false; } if ((!rlv_handler_t::isEnabled()) || (gRlvHandler.canSit(myObject, LLVector3::zero))) @@ -789,7 +789,7 @@ bool cmd_line_chat(const std::string& revised_text, EChatType type, bool from_ge msg->addVector3Fast(_PREHASH_Offset, LLVector3::zero); gAgent.getRegion()->sendReliableMessage(); - reportToNearbyChat(llformat("Sat on object with key %s", target_key.asString().c_str())); + report_to_nearby_chat(llformat("Sat on object with key %s", target_key.asString().c_str())); } } return false; @@ -799,7 +799,7 @@ bool cmd_line_chat(const std::string& revised_text, EChatType type, bool from_ge if ((!rlv_handler_t::isEnabled()) || (RlvActions::canStand())) { gAgent.setControlFlags(AGENT_CONTROL_STAND_UP); - reportToNearbyChat(std::string("Standing up")); + report_to_nearby_chat(std::string("Standing up")); } return false; } @@ -822,7 +822,7 @@ bool cmd_line_chat(const std::string& revised_text, EChatType type, bool from_ge gAgent.sendReliableMessage(); LLStringUtil::format_map_t args; args["NAME"] = LLSLURL("agent", target_key, "inspect").getSLURLString(); - reportToNearbyChat(LLTrans::getString("FSCmdLineTpOffered", args)); + report_to_nearby_chat(LLTrans::getString("FSCmdLineTpOffered", args)); } return false; } @@ -932,7 +932,7 @@ bool cmd_line_chat(const std::string& revised_text, EChatType type, bool from_ge { LLStringUtil::format_map_t args; args["RAND"] = llformat("%s", look_for.c_str()); - reportToNearbyChat(LLTrans::getString("FSCmdLineCalcRandError", args)); + report_to_nearby_chat(LLTrans::getString("FSCmdLineCalcRandError", args)); } std::string random_number_text = llformat("%d", random_number); expr.replace(random_string_pos, look_for.length(), random_number_text); @@ -957,7 +957,7 @@ bool cmd_line_chat(const std::string& revised_text, EChatType type, bool from_ge result_str << result; out = result_str.str(); } - reportToNearbyChat(out); + report_to_nearby_chat(out); return false; } } @@ -990,22 +990,22 @@ bool cmd_line_chat(const std::string& revised_text, EChatType type, bool from_ge { if (zdrop) { - reportToNearbyChat("Zdrop is already active."); + report_to_nearby_chat("Zdrop is already active."); } else { std::string destination; if (i >> destination) { - reportToNearbyChat("Beginning Zdrop."); - reportToNearbyChat("Verifying destination prim is present inworld..."); + report_to_nearby_chat("Beginning Zdrop."); + report_to_nearby_chat("Verifying destination prim is present inworld..."); if (!LLUUID::validate(destination)) { - reportToNearbyChat("Entered UUID is invalid! (Hint: use the \"copy key\" button in the build menu.)"); + report_to_nearby_chat("Entered UUID is invalid! (Hint: use the \"copy key\" button in the build menu.)"); } else if (!gObjectList.findObject(LLUUID(destination))) { - reportToNearbyChat("Unable to locate object. Please verify the object is rezzed and in view, and that the UUID is correct."); + report_to_nearby_chat("Unable to locate object. Please verify the object is rezzed and in view, and that the UUID is correct."); } else { @@ -1021,7 +1021,7 @@ bool cmd_line_chat(const std::string& revised_text, EChatType type, bool from_ge LLUUID folder_id = gInventory.findCategoryByName(folder); if (folder_id.notNull()) { - reportToNearbyChat("Verifying folder location..."); + report_to_nearby_chat("Verifying folder location..."); std::stack inventorystack; std::vector > inventory = findInventoryInFolder(folder); for (std::vector >::iterator it = inventory.begin(); it != inventory.end(); ++it) @@ -1031,32 +1031,32 @@ bool cmd_line_chat(const std::string& revised_text, EChatType type, bool from_ge } if (inventorystack.size()) { - reportToNearbyChat(llformat("Found folder \"%s\".", folder.c_str())); - reportToNearbyChat(llformat("Found prim \"%s\".", destination.c_str())); - reportToNearbyChat(llformat("Transferring inventory items from \"%s\" to prim \"%s\".", folder.c_str(), destination.c_str())); - reportToNearbyChat("WARNING: No-copy items will be moved to the destination prim!"); - reportToNearbyChat("Do not have the prim selected while transfer is running to reduce the chances of \"Inventory creation on in-world object failed.\""); - reportToNearbyChat("Use \"zdrop off\" to stop the transfer"); + report_to_nearby_chat(llformat("Found folder \"%s\".", folder.c_str())); + report_to_nearby_chat(llformat("Found prim \"%s\".", destination.c_str())); + report_to_nearby_chat(llformat("Transferring inventory items from \"%s\" to prim \"%s\".", folder.c_str(), destination.c_str())); + report_to_nearby_chat("WARNING: No-copy items will be moved to the destination prim!"); + report_to_nearby_chat("Do not have the prim selected while transfer is running to reduce the chances of \"Inventory creation on in-world object failed.\""); + report_to_nearby_chat("Use \"zdrop off\" to stop the transfer"); LLUUID sdest = LLUUID(destination); zdrop = new JCZdrop(inventorystack, sdest, folder.c_str(), destination.c_str()); } } else { - reportToNearbyChat(llformat("\"%s\" folder not found. Please check the spelling.", folder.c_str())); - reportToNearbyChat("Zdrop cannot work if the folder is inside another folder."); + report_to_nearby_chat(llformat("\"%s\" folder not found. Please check the spelling.", folder.c_str())); + report_to_nearby_chat("Zdrop cannot work if the folder is inside another folder."); } } catch (std::out_of_range) { - reportToNearbyChat("The Zdrop command transfers items from your inventory to a rezzed prim without the need to wait for the contents of the prim to load. No-copy items are moved to the prim. All other items are copied."); - reportToNearbyChat("Valid command: Zdrop (rezzed prim UUID) (source inventory folder name)"); + report_to_nearby_chat("The Zdrop command transfers items from your inventory to a rezzed prim without the need to wait for the contents of the prim to load. No-copy items are moved to the prim. All other items are copied."); + report_to_nearby_chat("Valid command: Zdrop (rezzed prim UUID) (source inventory folder name)"); } } } else { - reportToNearbyChat("Please specify an object UUID to copy the items in this folder to."); + report_to_nearby_chat("Please specify an object UUID to copy the items in this folder to."); } } } @@ -1064,7 +1064,7 @@ bool cmd_line_chat(const std::string& revised_text, EChatType type, bool from_ge { if (!zdrop) { - reportToNearbyChat("Zdrop is already deactivated."); + report_to_nearby_chat("Zdrop is already deactivated."); } else { @@ -1075,13 +1075,13 @@ bool cmd_line_chat(const std::string& revised_text, EChatType type, bool from_ge } else { - reportToNearbyChat(llformat("Invalid command: \"%s\". Valid commands: zdrop on (source inventory folder) (rezzed prim UUID); zdrop off", setting.c_str())); + report_to_nearby_chat(llformat("Invalid command: \"%s\". Valid commands: zdrop on (source inventory folder) (rezzed prim UUID); zdrop off", setting.c_str())); } } else { - reportToNearbyChat("The Zdrop command transfers items from your inventory to a rezzed prim without the need to wait for the contents of the prim to load. No-copy items are moved to the prim. All other items are copied."); - reportToNearbyChat("Valid commands: zdrop on (rezzed prim UUID) (source inventory folder name); zdrop off"); + report_to_nearby_chat("The Zdrop command transfers items from your inventory to a rezzed prim without the need to wait for the contents of the prim to load. No-copy items are moved to the prim. All other items are copied."); + report_to_nearby_chat("Valid commands: zdrop on (rezzed prim UUID) (source inventory folder name); zdrop off"); } return false; } @@ -1094,12 +1094,12 @@ bool cmd_line_chat(const std::string& revised_text, EChatType type, bool from_ge { if (ztake) { - reportToNearbyChat("Ztake is already active."); + report_to_nearby_chat("Ztake is already active."); } else { - reportToNearbyChat("Beginning Ztake."); - reportToNearbyChat("Verifying folder location..."); + report_to_nearby_chat("Beginning Ztake."); + report_to_nearby_chat("Verifying folder location..."); std::string folder_name; std::string tmp; while (i >> tmp) @@ -1112,18 +1112,18 @@ bool cmd_line_chat(const std::string& revised_text, EChatType type, bool from_ge LLUUID folder = gInventory.findCategoryByName(folder_name); if (folder.notNull()) { - reportToNearbyChat(llformat("Found destination folder \"%s\".", folder_name.c_str())); + report_to_nearby_chat(llformat("Found destination folder \"%s\".", folder_name.c_str())); ztake = new JCZtake(folder); } else { - reportToNearbyChat(llformat("\"%s\" folder not found. Please check the spelling.", folder_name.c_str())); - reportToNearbyChat("Ztake cannot work if the folder is inside another folder."); + report_to_nearby_chat(llformat("\"%s\" folder not found. Please check the spelling.", folder_name.c_str())); + report_to_nearby_chat("Ztake cannot work if the folder is inside another folder."); } } catch (std::out_of_range) { - reportToNearbyChat("Please specify a destination folder in your inventory."); + report_to_nearby_chat("Please specify a destination folder in your inventory."); } } } @@ -1131,7 +1131,7 @@ bool cmd_line_chat(const std::string& revised_text, EChatType type, bool from_ge { if (!ztake) { - reportToNearbyChat("Ztake is already deactivated."); + report_to_nearby_chat("Ztake is already deactivated."); } else { @@ -1142,14 +1142,14 @@ bool cmd_line_chat(const std::string& revised_text, EChatType type, bool from_ge } else { - reportToNearbyChat(llformat("Invalid command: \"%s\". Valid commands: ztake on (destination inventory folder); ztake off", setting.c_str())); + report_to_nearby_chat(llformat("Invalid command: \"%s\". Valid commands: ztake on (destination inventory folder); ztake off", setting.c_str())); } return false; } else { - reportToNearbyChat("The Ztake command copies selected rezzed objects into the folder you specify in your inventory."); - reportToNearbyChat("Valid commands: ztake on (destination inventory folder name); ztake off"); + report_to_nearby_chat("The Ztake command copies selected rezzed objects into the folder you specify in your inventory."); + report_to_nearby_chat("Valid commands: ztake on (destination inventory folder name); ztake off"); } return false; } @@ -1158,14 +1158,14 @@ bool cmd_line_chat(const std::string& revised_text, EChatType type, bool from_ge std::string destination; if (i >> destination) { - reportToNearbyChat("Verifying destination prim is present inworld..."); + report_to_nearby_chat("Verifying destination prim is present inworld..."); if (!LLUUID::validate(destination)) { - reportToNearbyChat("Entered UUID is invalid! (Hint: use the \"copy key\" button in the build menu.)"); + report_to_nearby_chat("Entered UUID is invalid! (Hint: use the \"copy key\" button in the build menu.)"); } else if (!gObjectList.findObject(LLUUID(destination))) { - reportToNearbyChat("Unable to locate object. Please verify the object is rezzed, in view, and that the UUID is correct."); + report_to_nearby_chat("Unable to locate object. Please verify the object is rezzed, in view, and that the UUID is correct."); } else { @@ -1181,24 +1181,24 @@ bool cmd_line_chat(const std::string& revised_text, EChatType type, bool from_ge LLUUID folder = gInventory.findCategoryByName(folder_name); if (folder.notNull()) { - reportToNearbyChat(llformat("Found destination folder \"%s\".", folder_name.c_str())); + report_to_nearby_chat(llformat("Found destination folder \"%s\".", folder_name.c_str())); ztake = new JCZtake(folder, true, LLUUID(destination), folder_name, (command == "cpackage") ? DRD_ACQUIRE_TO_AGENT_INVENTORY : DRD_TAKE_INTO_AGENT_INVENTORY); } else { - reportToNearbyChat(llformat("\"%s\" folder not found. Please check the spelling.", folder_name.c_str())); - reportToNearbyChat("The packager cannot work if the folder is inside another folder."); + report_to_nearby_chat(llformat("\"%s\" folder not found. Please check the spelling.", folder_name.c_str())); + report_to_nearby_chat("The packager cannot work if the folder is inside another folder."); } } catch (std::out_of_range) { - reportToNearbyChat("Please specify a destination folder in your inventory."); + report_to_nearby_chat("Please specify a destination folder in your inventory."); } } } else { - reportToNearbyChat(llformat("Packager usage: \"%s destination_prim_UUID inventory folder name\"",command.c_str())); + report_to_nearby_chat(llformat("Packager usage: \"%s destination_prim_UUID inventory folder name\"",command.c_str())); } return false; } @@ -1207,14 +1207,14 @@ bool cmd_line_chat(const std::string& revised_text, EChatType type, bool from_ge std::string destination; if (i >> destination) { - reportToNearbyChat("Verifying destination prim is present inworld..."); + report_to_nearby_chat("Verifying destination prim is present inworld..."); if (!LLUUID::validate(destination)) { - reportToNearbyChat("Entered UUID is invalid! (Hint: use the \"copy key\" button in the build menu.)"); + report_to_nearby_chat("Entered UUID is invalid! (Hint: use the \"copy key\" button in the build menu.)"); } else if (!gObjectList.findObject(LLUUID(destination))) { - reportToNearbyChat("Unable to locate object. Please verify the object is rezzed, in view, and that the UUID is correct."); + report_to_nearby_chat("Unable to locate object. Please verify the object is rezzed, in view, and that the UUID is correct."); } else { @@ -1234,7 +1234,7 @@ bool cmd_line_chat(const std::string& revised_text, EChatType type, bool from_ge if (!LLUUID::validate(take)) { - reportToNearbyChat("Entered UUID is invalid! (Hint: use the \"copy key\" button in the build menu.)"); + report_to_nearby_chat("Entered UUID is invalid! (Hint: use the \"copy key\" button in the build menu.)"); return false; } else @@ -1242,7 +1242,7 @@ bool cmd_line_chat(const std::string& revised_text, EChatType type, bool from_ge LLViewerObject* objectp = gObjectList.findObject(LLUUID(take)); if(!objectp) { - reportToNearbyChat("Unable to locate object. Please verify the object is rezzed, in view, and that the UUID is correct."); + report_to_nearby_chat("Unable to locate object. Please verify the object is rezzed, in view, and that the UUID is correct."); return false; } else @@ -1258,30 +1258,30 @@ bool cmd_line_chat(const std::string& revised_text, EChatType type, bool from_ge if (to_take.empty()) { - reportToNearbyChat("No objects to take."); + report_to_nearby_chat("No objects to take."); } else { - reportToNearbyChat(llformat("Found destination folder \"%s\".", folder_name.c_str())); + report_to_nearby_chat(llformat("Found destination folder \"%s\".", folder_name.c_str())); ztake = new JCZtake(folder, true, LLUUID(destination), folder_name, DRD_ACQUIRE_TO_AGENT_INVENTORY, false, to_take); } } else { - reportToNearbyChat(llformat("\"%s\" folder not found. Please check the spelling.", folder_name.c_str())); - reportToNearbyChat("The packager cannot work if the folder is inside another folder."); + report_to_nearby_chat(llformat("\"%s\" folder not found. Please check the spelling.", folder_name.c_str())); + report_to_nearby_chat("The packager cannot work if the folder is inside another folder."); } } catch (std::out_of_range) { - reportToNearbyChat("Please specify a destination folder in your inventory."); + report_to_nearby_chat("Please specify a destination folder in your inventory."); } } } } else { - reportToNearbyChat(llformat("Packager usage: \"%s destination_prim_UUID inventory folder name\"",command.c_str())); + report_to_nearby_chat(llformat("Packager usage: \"%s destination_prim_UUID inventory folder name\"",command.c_str())); } return false; } @@ -1291,14 +1291,14 @@ bool cmd_line_chat(const std::string& revised_text, EChatType type, bool from_ge std::string destination; if (i >> destination) { - reportToNearbyChat("Verifying destination prim is present inworld..."); + report_to_nearby_chat("Verifying destination prim is present inworld..."); if (!LLUUID::validate(destination)) { - reportToNearbyChat("Entered UUID is invalid! (Hint: use the \"copy key\" button in the build menu.)"); + report_to_nearby_chat("Entered UUID is invalid! (Hint: use the \"copy key\" button in the build menu.)"); } else if (!gObjectList.findObject(LLUUID(destination))) { - reportToNearbyChat("Unable to locate object. Please verify the object is rezzed, in view, and that the UUID is correct."); + report_to_nearby_chat("Unable to locate object. Please verify the object is rezzed, in view, and that the UUID is correct."); } else { @@ -1310,7 +1310,7 @@ bool cmd_line_chat(const std::string& revised_text, EChatType type, bool from_ge LLUUID folder = gInventory.findCategoryByName(folder_name); if (folder.notNull()) { - reportToNearbyChat(llformat("kpackager started. Destination folder: \"%s\" Listening to object: \"%s\"", folder_name.c_str(), destination.c_str())); + report_to_nearby_chat(llformat("kpackager started. Destination folder: \"%s\" Listening to object: \"%s\"", folder_name.c_str(), destination.c_str())); cmd_line_mPackagerToTake.clear(); cmd_line_mPackagerTargetFolderName = folder_name; @@ -1319,20 +1319,20 @@ bool cmd_line_chat(const std::string& revised_text, EChatType type, bool from_ge } else { - reportToNearbyChat(llformat("\"%s\" folder not found. Please check the spelling.", folder_name.c_str())); - reportToNearbyChat("The packager cannot work if the folder is inside another folder."); + report_to_nearby_chat(llformat("\"%s\" folder not found. Please check the spelling.", folder_name.c_str())); + report_to_nearby_chat("The packager cannot work if the folder is inside another folder."); } } catch (std::out_of_range) { - reportToNearbyChat("Please specify a destination folder in your inventory."); + report_to_nearby_chat("Please specify a destination folder in your inventory."); } } } } else { - reportToNearbyChat(llformat("Packager usage: \"%s destination_prim_UUID inventory folder name\"",command.c_str())); + report_to_nearby_chat(llformat("Packager usage: \"%s destination_prim_UUID inventory folder name\"",command.c_str())); } return false; } @@ -1342,7 +1342,7 @@ bool cmd_line_chat(const std::string& revised_text, EChatType type, bool from_ge cmd_line_mPackagerTargetFolderName = ""; cmd_line_mPackagerTargetFolder.setNull(); cmd_line_mPackagerDest.setNull(); - reportToNearbyChat("Packager: Stopped and cleared."); + report_to_nearby_chat("Packager: Stopped and cleared."); return false; } } @@ -1364,7 +1364,7 @@ bool cmd_line_chat(const std::string& revised_text, EChatType type, bool from_ge if (!LLUUID::validate(take)) { - reportToNearbyChat("Entered UUID is invalid! (Hint: use the \"copy key\" button in the build menu.)"); + report_to_nearby_chat("Entered UUID is invalid! (Hint: use the \"copy key\" button in the build menu.)"); return false; } else @@ -1372,7 +1372,7 @@ bool cmd_line_chat(const std::string& revised_text, EChatType type, bool from_ge LLViewerObject* objectp = gObjectList.findObject(LLUUID(take)); if(!objectp) { - reportToNearbyChat("Unable to locate object. Please verify the object is rezzed, in view, and that the UUID is correct."); + report_to_nearby_chat("Unable to locate object. Please verify the object is rezzed, in view, and that the UUID is correct."); return false; } else @@ -1388,23 +1388,23 @@ bool cmd_line_chat(const std::string& revised_text, EChatType type, bool from_ge if (to_take.empty()) { - reportToNearbyChat("No objects to take."); + report_to_nearby_chat("No objects to take."); } else { - reportToNearbyChat(llformat("Found destination folder \"%s\".", folder_name.c_str())); + report_to_nearby_chat(llformat("Found destination folder \"%s\".", folder_name.c_str())); ztake = new JCZtake(folder, true, LLUUID::null, folder_name, (command == "kcopy") ? DRD_ACQUIRE_TO_AGENT_INVENTORY : DRD_TAKE_INTO_AGENT_INVENTORY, false, to_take); } } else { - reportToNearbyChat(llformat("\"%s\" folder not found. Please check the spelling.", folder_name.c_str())); - reportToNearbyChat("The packager cannot work if the folder is inside another folder."); + report_to_nearby_chat(llformat("\"%s\" folder not found. Please check the spelling.", folder_name.c_str())); + report_to_nearby_chat("The packager cannot work if the folder is inside another folder."); } } catch (std::out_of_range) { - reportToNearbyChat("Please specify a destination folder in your inventory."); + report_to_nearby_chat("Please specify a destination folder in your inventory."); } } return false; @@ -1418,12 +1418,12 @@ bool cmd_line_chat(const std::string& revised_text, EChatType type, bool from_ge { if (mtake) { - reportToNearbyChat("Mtake is already active."); + report_to_nearby_chat("Mtake is already active."); } else { - reportToNearbyChat("Beginning Mtake."); - reportToNearbyChat("Verifying folder location..."); + report_to_nearby_chat("Beginning Mtake."); + report_to_nearby_chat("Verifying folder location..."); std::string folder_name; std::string tmp; while (i >> tmp) @@ -1436,18 +1436,18 @@ bool cmd_line_chat(const std::string& revised_text, EChatType type, bool from_ge LLUUID folder = gInventory.findCategoryByName(folder_name); if (folder.notNull()) { - reportToNearbyChat(llformat("Found destination folder \"%s\".", folder_name.c_str())); + report_to_nearby_chat(llformat("Found destination folder \"%s\".", folder_name.c_str())); mtake = new TMZtake(folder); } else { - reportToNearbyChat(llformat("\"%s\" folder not found. Please check the spelling.", folder_name.c_str())); - reportToNearbyChat("Mtake cannot work if the folder is inside another folder."); + report_to_nearby_chat(llformat("\"%s\" folder not found. Please check the spelling.", folder_name.c_str())); + report_to_nearby_chat("Mtake cannot work if the folder is inside another folder."); } } catch (std::out_of_range) { - reportToNearbyChat("Please specify a destination folder in your inventory."); + report_to_nearby_chat("Please specify a destination folder in your inventory."); } } } @@ -1455,7 +1455,7 @@ bool cmd_line_chat(const std::string& revised_text, EChatType type, bool from_ge { if (!mtake) { - reportToNearbyChat("Mtake is already deactivated."); + report_to_nearby_chat("Mtake is already deactivated."); } else { @@ -1466,14 +1466,14 @@ bool cmd_line_chat(const std::string& revised_text, EChatType type, bool from_ge } else { - reportToNearbyChat(llformat("Invalid command: \"%s\". Valid commands: mtake on (destination inventory folder); mtake off", setting.c_str())); + report_to_nearby_chat(llformat("Invalid command: \"%s\". Valid commands: mtake on (destination inventory folder); mtake off", setting.c_str())); } return false; } else { - reportToNearbyChat("The Mtake command renames selected rezzed objects to the dimensions of the prim, then copies them into the folder you specify in your inventory."); - reportToNearbyChat("Valid commands: mtake on (destination inventory folder name); mtake off"); + report_to_nearby_chat("The Mtake command renames selected rezzed objects to the dimensions of the prim, then copies them into the folder you specify in your inventory."); + report_to_nearby_chat("Valid commands: mtake on (destination inventory folder name); mtake off"); } return false; } @@ -1493,11 +1493,11 @@ bool cmd_line_chat(const std::string& revised_text, EChatType type, bool from_ge LLStringUtil::format_map_t args; args["[POS]"] = cameraPositionString; - reportToNearbyChat(LLTrans::getString("FSCameraPositionCopied", args)); + report_to_nearby_chat(LLTrans::getString("FSCameraPositionCopied", args)); } else { - reportToNearbyChat("Could not get a valid region pointer."); + report_to_nearby_chat("Could not get a valid region pointer."); } return false; } @@ -1535,7 +1535,7 @@ bool cmd_line_chat(const std::string& revised_text, EChatType type, bool from_ge { LLStringUtil::format_map_t args; args["COMMAND"] = llformat("%s", std::string(sFSCmdLineRollDice).c_str()); - reportToNearbyChat(LLTrans::getString("FSCmdLineRollDiceModifiersInvalid", args)); + report_to_nearby_chat(LLTrans::getString("FSCmdLineRollDiceModifiersInvalid", args)); return false; } @@ -1552,11 +1552,11 @@ bool cmd_line_chat(const std::string& revised_text, EChatType type, bool from_ge { result_per_die -= 1; die_penetrated = 0; - reportToNearbyChat(llformat("#%d 1d%d-1: %d.", die_iter, faces, result_per_die)); + report_to_nearby_chat(llformat("#%d 1d%d-1: %d.", die_iter, faces, result_per_die)); } else { - reportToNearbyChat(llformat("#%d 1d%d: %d.", die_iter, faces, result_per_die)); + report_to_nearby_chat(llformat("#%d 1d%d: %d.", die_iter, faces, result_per_die)); } result += result_per_die; ++die_iter; @@ -1566,7 +1566,7 @@ bool cmd_line_chat(const std::string& revised_text, EChatType type, bool from_ge // Modifier: Successes lower than a value if (result_per_die <= modifier) { - reportToNearbyChat(" ^-- " + LLTrans::getString("FSCmdLineRollDiceSuccess")); + report_to_nearby_chat(" ^-- " + LLTrans::getString("FSCmdLineRollDiceSuccess")); ++successes; } else @@ -1579,7 +1579,7 @@ bool cmd_line_chat(const std::string& revised_text, EChatType type, bool from_ge // Modifier: Successes greater than a value if (result_per_die >= modifier) { - reportToNearbyChat(" ^-- " + LLTrans::getString("FSCmdLineRollDiceSuccess")); + report_to_nearby_chat(" ^-- " + LLTrans::getString("FSCmdLineRollDiceSuccess")); ++successes; } else @@ -1590,13 +1590,13 @@ bool cmd_line_chat(const std::string& revised_text, EChatType type, bool from_ge else if ((modifier_type == "!" && result_per_die == modifier) || (modifier_type == "!>" && result_per_die >= modifier) || (modifier_type == "!<" && result_per_die <= modifier)) { // Modifier: Exploding dice - reportToNearbyChat(" ^-- " + LLTrans::getString("FSCmdLineRollDiceExploded")); + report_to_nearby_chat(" ^-- " + LLTrans::getString("FSCmdLineRollDiceExploded")); --die_iter; } else if ((modifier_type == "!p" && result_per_die == modifier) || (modifier_type == "!p>" && result_per_die >= modifier) || (modifier_type == "!p<" && result_per_die <= modifier)) { // Modifier: Penetrating dice (special style of exploding dice) - reportToNearbyChat(" ^-- " + LLTrans::getString("FSCmdLineRollDicePenetrated")); + report_to_nearby_chat(" ^-- " + LLTrans::getString("FSCmdLineRollDicePenetrated")); die_penetrated = 1; --die_iter; } @@ -1604,7 +1604,7 @@ bool cmd_line_chat(const std::string& revised_text, EChatType type, bool from_ge { // Modifier: Reroll result -= result_per_die; - reportToNearbyChat(" ^-- " + LLTrans::getString("FSCmdLineRollDiceReroll")); + report_to_nearby_chat(" ^-- " + LLTrans::getString("FSCmdLineRollDiceReroll")); --die_iter; } @@ -1614,7 +1614,7 @@ bool cmd_line_chat(const std::string& revised_text, EChatType type, bool from_ge // More than 1000 iterations already? We probably have an infinite loop - kill all further rolls // Explosions can trigger this easily, "rolld 1 6 !> 0" for example die_iter = 102; - reportToNearbyChat(LLTrans::getString("FSCmdLineRollDiceFreezeGuard")); + report_to_nearby_chat(LLTrans::getString("FSCmdLineRollDiceFreezeGuard")); return false; } } @@ -1634,14 +1634,14 @@ bool cmd_line_chat(const std::string& revised_text, EChatType type, bool from_ge else if (modifier_type == ">" || modifier_type == "<") { // Modifier: Successes - reportToNearbyChat(LLTrans::getString("FSCmdLineRollDiceSuccess") + ": " + llformat("%d", successes)); + report_to_nearby_chat(LLTrans::getString("FSCmdLineRollDiceSuccess") + ": " + llformat("%d", successes)); } modifier_type = modifier_type + llformat("%d", modifier); } } else { - reportToNearbyChat(LLTrans::getString("FSCmdLineRollDiceLimits")); + report_to_nearby_chat(LLTrans::getString("FSCmdLineRollDiceLimits")); return false; } } @@ -1657,7 +1657,7 @@ bool cmd_line_chat(const std::string& revised_text, EChatType type, bool from_ge args["FACES"] = llformat("%d", faces); args["RESULT"] = llformat("%d", result); args["MODIFIER"] = llformat("%s", modifier_type.c_str()); - reportToNearbyChat(LLTrans::getString("FSCmdLineRollDiceTotal", args)); + report_to_nearby_chat(LLTrans::getString("FSCmdLineRollDiceTotal", args)); return false; } } @@ -1790,7 +1790,7 @@ bool cmdline_packager(const std::string& message, const LLUUID& fromID, const LL LLViewerObject* objectp = gObjectList.findObject(LLUUID(item)); if(!objectp) { - reportToNearbyChat(llformat("Packager: Unable to locate object. Please verify the object is rezzed, in view, and that the UUID is correct: \"%s\"", item.c_str())); + report_to_nearby_chat(llformat("Packager: Unable to locate object. Please verify the object is rezzed, in view, and that the UUID is correct: \"%s\"", item.c_str())); return false; } else @@ -1806,12 +1806,12 @@ bool cmdline_packager(const std::string& message, const LLUUID& fromID, const LL } while(comma < csv.length()); - reportToNearbyChat(llformat("Packager: adding objects: \"%s\"", csv.c_str())); + report_to_nearby_chat(llformat("Packager: adding objects: \"%s\"", csv.c_str())); return true; } else if (cmd == "kpackagerend") { - reportToNearbyChat("Packager: finilizing."); + report_to_nearby_chat("Packager: finilizing."); ztake = new JCZtake(cmd_line_mPackagerTargetFolder, true, cmd_line_mPackagerDest, cmd_line_mPackagerTargetFolderName, DRD_ACQUIRE_TO_AGENT_INVENTORY, false, cmd_line_mPackagerToTake); cmd_line_mPackagerToTake.clear(); cmd_line_mPackagerTargetFolderName = ""; diff --git a/indra/newview/fscommon.cpp b/indra/newview/fscommon.cpp index e333fbb9f1..4191c1bd52 100644 --- a/indra/newview/fscommon.cpp +++ b/indra/newview/fscommon.cpp @@ -61,7 +61,7 @@ extern S32 gMaxAgentGroups; S32 FSCommon::sObjectAddMsg = 0; -void reportToNearbyChat(const std::string& message) +void report_to_nearby_chat(const std::string& message) { LLChat chat; chat.mText = message; @@ -69,73 +69,7 @@ void reportToNearbyChat(const std::string& message) LLNotificationsUI::LLNotificationManager::instance().onChat(chat, LLSD()); } -std::string applyAutoCloseOoc(const std::string& message) -{ - if (!gSavedSettings.getBOOL("AutoCloseOOC")) - { - return message; - } - - std::string utf8_text(message); - - // Try to find any unclosed OOC chat (i.e. an opening - // double parenthesis without a matching closing double - // parenthesis. - if (utf8_text.find("(( ") != -1 && utf8_text.find("))") == -1) - { - // add the missing closing double parenthesis. - utf8_text += " ))"; - } - else if (utf8_text.find("((") != -1 && utf8_text.find("))") == -1) - { - if (utf8_text.at(utf8_text.length() - 1) == ')') - { - // cosmetic: add a space first to avoid a closing triple parenthesis - utf8_text += " "; - } - // add the missing closing double parenthesis. - utf8_text += "))"; - } - else if (utf8_text.find("[[ ") != -1 && utf8_text.find("]]") == -1) - { - // add the missing closing double parenthesis. - utf8_text += " ]]"; - } - else if (utf8_text.find("[[") != -1 && utf8_text.find("]]") == -1) - { - if (utf8_text.at(utf8_text.length() - 1) == ']') - { - // cosmetic: add a space first to avoid a closing triple parenthesis - utf8_text += " "; - } - // add the missing closing double parenthesis. - utf8_text += "]]"; - } - - return utf8_text; -} - -std::string applyMuPose(const std::string& message) -{ - std::string utf8_text(message); - - // Convert MU*s style poses into IRC emotes here. - if (gSavedSettings.getBOOL("AllowMUpose") && utf8_text.find(":") == 0 && utf8_text.length() > 3) - { - if (utf8_text.find(":'") == 0) - { - utf8_text.replace(0, 1, "/me"); - } - else if (!isdigit(utf8_text.at(1)) && !ispunct(utf8_text.at(1)) && !isspace(utf8_text.at(1))) // Do not prevent smileys and such. - { - utf8_text.replace(0, 1, "/me "); - } - } - - return utf8_text; -} - -std::string formatString(std::string text, const LLStringUtil::format_map_t& args) +std::string format_string(std::string text, const LLStringUtil::format_map_t& args) { LLStringUtil::format(text, args); return text; @@ -147,6 +81,68 @@ bool is_irc_me_prefix(const std::string& text) return (prefix == "/me " || prefix == "/me'"); } +std::string FSCommon::applyAutoCloseOoc(std::string message) +{ + if (!gSavedSettings.getBOOL("AutoCloseOOC")) + { + return message; + } + + // Try to find any unclosed OOC chat (i.e. an opening + // double parenthesis without a matching closing double + // parenthesis. + if (message.find("(( ") != std::string::npos && message.find("))") == std::string::npos) + { + // add the missing closing double parenthesis. + message += " ))"; + } + else if (message.find("((") != std::string::npos && message.find("))") == std::string::npos) + { + if (message.at(message.length() - 1) == ')') + { + // cosmetic: add a space first to avoid a closing triple parenthesis + message += " "; + } + // add the missing closing double parenthesis. + message += "))"; + } + else if (message.find("[[ ") != std::string::npos && message.find("]]") == std::string::npos) + { + // add the missing closing double parenthesis. + message += " ]]"; + } + else if (message.find("[[") != std::string::npos && message.find("]]") == std::string::npos) + { + if (message.at(message.length() - 1) == ']') + { + // cosmetic: add a space first to avoid a closing triple parenthesis + message += " "; + } + // add the missing closing double parenthesis. + message += "]]"; + } + + return message; +} + +std::string FSCommon::applyMuPose(std::string message) +{ + // Convert MU*s style poses into IRC emotes here. + if (gSavedSettings.getBOOL("AllowMUpose") && message.find(":") == 0 && message.length() > 3) + { + if (message.find(":'") == 0) + { + message.replace(0, 1, "/me"); + } + else if (!isdigit(message.at(1)) && !ispunct(message.at(1)) && !isspace(message.at(1))) // Do not prevent smileys and such. + { + message.replace(0, 1, "/me "); + } + } + + return message; +} + S32 FSCommon::secondsSinceEpochFromString(const std::string& format, const std::string& str) { // LLDateUtil::secondsSinceEpochFromString does not handle time, only the date. diff --git a/indra/newview/fscommon.h b/indra/newview/fscommon.h index 64dfb07098..7dbee113ab 100644 --- a/indra/newview/fscommon.h +++ b/indra/newview/fscommon.h @@ -36,14 +36,15 @@ class LLViewerObject; const F32 AVATAR_UNKNOWN_Z_OFFSET = -1.f; // Const value for avatars at unknown height const F32 AVATAR_UNKNOWN_RANGE = -1.f; -void reportToNearbyChat(const std::string& message); -std::string applyAutoCloseOoc(const std::string& message); -std::string applyMuPose(const std::string& message); -std::string formatString(std::string text, const LLStringUtil::format_map_t& args); +void report_to_nearby_chat(const std::string& message); +std::string format_string(std::string text, const LLStringUtil::format_map_t& args); bool is_irc_me_prefix(const std::string& text); namespace FSCommon { + std::string applyAutoCloseOoc(std::string message); + std::string applyMuPose(std::string message); + /** * Convert a string of a specified date format into seconds since the Epoch. * diff --git a/indra/newview/fsfloaterim.cpp b/indra/newview/fsfloaterim.cpp index e181dd29d4..a2ba9a17c8 100644 --- a/indra/newview/fsfloaterim.cpp +++ b/indra/newview/fsfloaterim.cpp @@ -356,8 +356,8 @@ void FSFloaterIM::sendMsgFromInputEditor(EChatType type) std::string utf8_text = wstring_to_utf8str(text); // Convert OOC and MU* style poses - utf8_text = applyAutoCloseOoc(utf8_text); - utf8_text = applyMuPose(utf8_text); + utf8_text = FSCommon::applyAutoCloseOoc(utf8_text); + utf8_text = FSCommon::applyMuPose(utf8_text); // Support group chat prefix static LLCachedControl chat_prefix(gSavedSettings, "FSSupportGroupChatPrefix2"); diff --git a/indra/newview/fsfloaternearbychat.cpp b/indra/newview/fsfloaternearbychat.cpp index fd43ba3fdb..dfbe80634d 100644 --- a/indra/newview/fsfloaternearbychat.cpp +++ b/indra/newview/fsfloaternearbychat.cpp @@ -764,8 +764,8 @@ void FSFloaterNearbyChat::sendChat( EChatType type ) if (0 == channel) { // Convert OOC and MU* style poses - utf8text = applyAutoCloseOoc(utf8text); - utf8text = applyMuPose(utf8text); + utf8text = FSCommon::applyAutoCloseOoc(utf8text); + utf8text = FSCommon::applyMuPose(utf8text); // discard returned "found" boolean if(!LLGestureMgr::instance().triggerAndReviseString(utf8text, &utf8_revised_text)) diff --git a/indra/newview/fslslbridge.cpp b/indra/newview/fslslbridge.cpp index ca89fdd82d..2a4b4c3a8e 100644 --- a/indra/newview/fslslbridge.cpp +++ b/indra/newview/fslslbridge.cpp @@ -221,7 +221,7 @@ bool FSLSLBridge::lslToViewer(const std::string& message, const LLUUID& fromID, if (gSavedPerAccountSettings.getBOOL("UseMoveLock")) { updateBoolSettingValue("UseMoveLock"); - reportToNearbyChat(LLTrans::getString("MovelockEnabling")); + report_to_nearby_chat(LLTrans::getString("MovelockEnabling")); } // @@ -238,7 +238,7 @@ bool FSLSLBridge::lslToViewer(const std::string& message, const LLUUID& fromID, { // Don't call for update here and only change setting to 'false', getCommitSignal()->connect->boost in llviewercontrol.cpp will send a message to Bridge anyway gSavedPerAccountSettings.setBOOL("UseMoveLock", false); - reportToNearbyChat(LLTrans::getString("MovelockDisabling")); + report_to_nearby_chat(LLTrans::getString("MovelockDisabling")); } else { @@ -329,24 +329,24 @@ bool FSLSLBridge::lslToViewer(const std::string& message, const LLUUID& fromID, { LLStringUtil::format_map_t args2; args2["OBJECT_CHARACTER_TIME"] = scriptInfoArray[5].asString(); - args["PATHFINDING_TEXT"] = " " + formatString(LLTrans::getString("fsbridge_script_info_pf"), args2); + args["PATHFINDING_TEXT"] = " " + format_string(LLTrans::getString("fsbridge_script_info_pf"), args2); } else { args["PATHFINDING_TEXT"] = ""; } - reportToNearbyChat(formatString(LLTrans::getString("fsbridge_script_info"), args)); + report_to_nearby_chat(format_string(LLTrans::getString("fsbridge_script_info"), args)); } else { - reportToNearbyChat(LLTrans::getString("fsbridge_error_scriptinfonotfound")); + report_to_nearby_chat(LLTrans::getString("fsbridge_error_scriptinfonotfound")); LL_WARNS("FSLSLBridge") << "ScriptInfo - Object to check is invalid or out of range (warning returned by viewer, data somehow passed bridge script check)" << LL_ENDL; } } else { - reportToNearbyChat(LLTrans::getString("fsbridge_error_scriptinfomalformed")); + report_to_nearby_chat(LLTrans::getString("fsbridge_error_scriptinfomalformed")); LL_WARNS("FSLSLBridge") << "ScriptInfo - Received malformed response from bridge (missing ending tag)" << LL_ENDL; } } @@ -361,11 +361,11 @@ bool FSLSLBridge::lslToViewer(const std::string& message, const LLUUID& fromID, { if (message.substr(valuepos + FS_STATE_ATTRIBUTE.size(), 1) == "1") { - reportToNearbyChat(LLTrans::getString("MovelockEnabled")); + report_to_nearby_chat(LLTrans::getString("MovelockEnabled")); } else if (message.substr(valuepos + FS_STATE_ATTRIBUTE.size(), 1) == "0") { - reportToNearbyChat(LLTrans::getString("MovelockDisabled")); + report_to_nearby_chat(LLTrans::getString("MovelockDisabled")); } else { @@ -384,17 +384,17 @@ bool FSLSLBridge::lslToViewer(const std::string& message, const LLUUID& fromID, { if (message.substr(valuepos + FS_ERROR_ATTRIBUTE.size(), 9) == "injection") { - reportToNearbyChat(LLTrans::getString("fsbridge_error_injection")); + report_to_nearby_chat(LLTrans::getString("fsbridge_error_injection")); LL_WARNS("FSLSLBridge") << "Script injection detected" << LL_ENDL; } else if (message.substr(valuepos + FS_ERROR_ATTRIBUTE.size(), 18) == "scriptinfonotfound") { - reportToNearbyChat(LLTrans::getString("fsbridge_error_scriptinfonotfound")); + report_to_nearby_chat(LLTrans::getString("fsbridge_error_scriptinfonotfound")); LL_WARNS("FSLSLBridge") << "ScriptInfo - Object to check is invalid or out of range (warning returned by bridge)" << LL_ENDL; } else if (message.substr(valuepos + FS_ERROR_ATTRIBUTE.size(), 7) == "wrongvm") { - reportToNearbyChat(LLTrans::getString("fsbridge_error_wrongvm")); + report_to_nearby_chat(LLTrans::getString("fsbridge_error_wrongvm")); LL_WARNS("FSLSLBridge") << "Script is using old LSO (16 KB memory limit) instead of new Mono (64 KB memory limit) virtual machine, which creates high probability of stack-heap collision and bridge failure by running out of memory" << LL_ENDL; } else @@ -485,7 +485,7 @@ void FSLSLBridge::recreateBridge() { // FIRE-11746: Recreate should throw error if disabled LL_WARNS("FSLSLBridge") << "Asked to create bridge, but bridge is disabled. Aborting." << LL_ENDL; - reportToNearbyChat(LLTrans::getString("fsbridge_cant_create_disabled")); + report_to_nearby_chat(LLTrans::getString("fsbridge_cant_create_disabled")); setBridgeCreating(false); // FIRE-11746 return; @@ -494,7 +494,7 @@ void FSLSLBridge::recreateBridge() if (gSavedSettings.getBOOL("NoInventoryLibrary")) { LL_WARNS("FSLSLBridge") << "Asked to create bridge, but we don't have a library. Aborting." << LL_ENDL; - reportToNearbyChat(LLTrans::getString("fsbridge_no_library")); + report_to_nearby_chat(LLTrans::getString("fsbridge_no_library")); setBridgeCreating(false); return; } @@ -502,12 +502,12 @@ void FSLSLBridge::recreateBridge() if (mBridgeCreating) { LL_WARNS("FSLSLBridge") << "Bridge creation already in progress, aborting new attempt." << LL_ENDL; - reportToNearbyChat(LLTrans::getString("fsbridge_already_creating")); + report_to_nearby_chat(LLTrans::getString("fsbridge_already_creating")); return; } //announce yourself - reportToNearbyChat(LLTrans::getString("fsbridge_creating")); + report_to_nearby_chat(LLTrans::getString("fsbridge_creating")); LLUUID catID = findFSCategory(); @@ -593,7 +593,7 @@ void FSLSLBridge::initBridge() if (gSavedSettings.getBOOL("NoInventoryLibrary")) { LL_WARNS("FSLSLBridge") << "Asked to create bridge, but we don't have a library. Aborting." << LL_ENDL; - reportToNearbyChat(LLTrans::getString("fsbridge_no_library")); + report_to_nearby_chat(LLTrans::getString("fsbridge_no_library")); setBridgeCreating(false); return; } @@ -663,7 +663,7 @@ void FSLSLBridge::startCreation() setBridgeCreating(true); mFinishCreation = false; //announce yourself - reportToNearbyChat(LLTrans::getString("fsbridge_creating")); + report_to_nearby_chat(LLTrans::getString("fsbridge_creating")); createNewBridge(); } @@ -724,7 +724,7 @@ void FSLSLBridge::processAttach(LLViewerObject* object, const LLViewerJointAttac LL_WARNS("FSLSLBridge") << "Bridge not created. Our bridge container attachment isn't named correctly." << LL_ENDL; if (mBridgeCreating) { - reportToNearbyChat(LLTrans::getString("fsbridge_failure_creation_bad_name")); + report_to_nearby_chat(LLTrans::getString("fsbridge_failure_creation_bad_name")); setBridgeCreating(false); //in case we interrupted the creation } return; @@ -736,7 +736,7 @@ void FSLSLBridge::processAttach(LLViewerObject* object, const LLViewerJointAttac LL_WARNS("FSLSLBridge") << "Bridge container is still NULL in inventory. Aborting." << LL_ENDL; if (mBridgeCreating) { - reportToNearbyChat(LLTrans::getString("fsbridge_failure_creation_null")); + report_to_nearby_chat(LLTrans::getString("fsbridge_failure_creation_null")); setBridgeCreating(false); //in case we interrupted the creation } return; @@ -750,7 +750,7 @@ void FSLSLBridge::processAttach(LLViewerObject* object, const LLViewerJointAttac mAllowDetach = true; LLVOAvatarSelf::detachAttachmentIntoInventory(fsObject->getUUID()); LL_WARNS("FSLSLBridge") << "Attempt to attach to bridge point an object other than current bridge" << LL_ENDL; - reportToNearbyChat(LLTrans::getString("fsbridge_failure_attach_wrong_object")); + report_to_nearby_chat(LLTrans::getString("fsbridge_failure_attach_wrong_object")); if (mBridgeCreating) { setBridgeCreating(false); //in case we interrupted the creation @@ -768,7 +768,7 @@ void FSLSLBridge::processAttach(LLViewerObject* object, const LLViewerJointAttac LL_WARNS("FSLSLBridge") << "Bridge container isn't in the correct inventory location. Detaching it and aborting." << LL_ENDL; if (mBridgeCreating) { - reportToNearbyChat(LLTrans::getString("fs_bridge_failure_attach_wrong_location")); + report_to_nearby_chat(LLTrans::getString("fs_bridge_failure_attach_wrong_location")); setBridgeCreating(false); //in case we interrupted the creation } return; @@ -785,7 +785,7 @@ void FSLSLBridge::processAttach(LLViewerObject* object, const LLViewerJointAttac LL_WARNS("FSLSLBridge") << "Something unknown just got attached to bridge point, detaching and aborting." << LL_ENDL; if (mBridgeCreating) { - reportToNearbyChat(LLTrans::getString("fsbridge_failure_attach_point_in_use")); + report_to_nearby_chat(LLTrans::getString("fsbridge_failure_attach_point_in_use")); setBridgeCreating(false); //in case we interrupted the creation } LLVOAvatarSelf::detachAttachmentIntoInventory(mpBridge->getUUID()); @@ -861,7 +861,7 @@ void FSLSLBridge::inventoryChanged(LLViewerObject* object, } else { - reportToNearbyChat(LLTrans::getString("fsbridge_warning_unexpected_items")); + report_to_nearby_chat(LLTrans::getString("fsbridge_warning_unexpected_items")); LL_WARNS("FSLSLBridge") << "The bridge inventory contains items other than bridge script." << LL_ENDL; if (!isOurScript) //some junk but no valid script? Unlikely to happen, but lets add script anyway. { @@ -885,7 +885,7 @@ void FSLSLBridge::inventoryChanged(LLViewerObject* object, LL_INFOS("FSLSLBridge") << "Bridge created." << LL_ENDL; mFinishCreation = false; mAllowedDetachables.clear(); - reportToNearbyChat(LLTrans::getString("fsbridge_created")); + report_to_nearby_chat(LLTrans::getString("fsbridge_created")); } } @@ -970,11 +970,11 @@ void FSLSLBridge::processDetach(LLViewerObject* object, const LLViewerJointAttac if (mpBridge && mpBridge->getUUID() == fsObject->getUUID()) { mpBridge = NULL; - reportToNearbyChat(LLTrans::getString("fsbridge_detached")); + report_to_nearby_chat(LLTrans::getString("fsbridge_detached")); mIsFirstCallDone = false; if (mBridgeCreating) { - reportToNearbyChat(LLTrans::getString("fsbridge_warning_not_finished")); + report_to_nearby_chat(LLTrans::getString("fsbridge_warning_not_finished")); setBridgeCreating(false); //in case we interrupted the creation mAllowedDetachables.clear(); } @@ -1183,7 +1183,7 @@ void FSLSLBridgeScriptCallback::fire(const LLUUID& inv_item) } else { - reportToNearbyChat(LLTrans::getString("fsbridge_failure_creation_create_script")); + report_to_nearby_chat(LLTrans::getString("fsbridge_failure_creation_create_script")); cleanup = true; } } @@ -1309,7 +1309,7 @@ void FSLSLBridge::cleanUpBridge() { //something unexpected went wrong. Try to clean up and not crash. LL_WARNS("FSLSLBridge") << "Bridge object not found. Can't proceed with creation, exiting." << LL_ENDL; - reportToNearbyChat(LLTrans::getString("fsbridge_failure_not_found")); + report_to_nearby_chat(LLTrans::getString("fsbridge_failure_not_found")); if (isBridgeValid()) { diff --git a/indra/newview/fsnearbychathub.cpp b/indra/newview/fsnearbychathub.cpp index c92a356b71..1b4dc4b067 100644 --- a/indra/newview/fsnearbychathub.cpp +++ b/indra/newview/fsnearbychathub.cpp @@ -269,8 +269,8 @@ void FSNearbyChat::sendChat(LLWString text, EChatType type) if (0 == channel) { // Convert OOC and MU* style poses - utf8text = applyAutoCloseOoc(utf8text); - utf8text = applyMuPose(utf8text); + utf8text = FSCommon::applyAutoCloseOoc(utf8text); + utf8text = FSCommon::applyMuPose(utf8text); // discard returned "found" boolean if(!LLGestureMgr::instance().triggerAndReviseString(utf8text, &utf8_revised_text)) diff --git a/indra/newview/fsradar.cpp b/indra/newview/fsradar.cpp index d6d701f841..276fe6124e 100644 --- a/indra/newview/fsradar.cpp +++ b/indra/newview/fsradar.cpp @@ -380,7 +380,7 @@ void FSRadar::updateRadarList() { LLStringUtil::format_map_t args; args["DISTANCE"] = llformat("%3.2f", avRange); - std::string message = formatString(str_chat_entering, args); + std::string message = format_string(str_chat_entering, args); make_ui_sound("UISndRadarChatEnter"); // FIRE-6069: Radar alerts sounds LLAvatarNameCache::get(avId, boost::bind(&FSRadar::radarAlertMsg, this, _1, _2, message)); } @@ -388,7 +388,7 @@ void FSRadar::updateRadarList() { LLStringUtil::format_map_t args; args["DISTANCE"] = llformat("%3.2f", avRange); - std::string message = formatString(str_draw_distance_entering, args); + std::string message = format_string(str_draw_distance_entering, args); make_ui_sound("UISndRadarDrawEnter"); // FIRE-6069: Radar alerts sounds LLAvatarNameCache::get(avId, boost::bind(&FSRadar::radarAlertMsg, this, _1, _2, message)); } @@ -399,7 +399,7 @@ void FSRadar::updateRadarList() { LLStringUtil::format_map_t args; args["DISTANCE"] = llformat("%3.2f", avRange); - std::string message = formatString(str_region_entering_distance, args); + std::string message = format_string(str_region_entering_distance, args); LLAvatarNameCache::get(avId, boost::bind(&FSRadar::radarAlertMsg, this, _1, _2, message)); } else @@ -437,7 +437,7 @@ void FSRadar::updateRadarList() { LLStringUtil::format_map_t args; args["DISTANCE"] = llformat("%3.2f", avRange); - std::string message = formatString(str_chat_entering, args); + std::string message = format_string(str_chat_entering, args); make_ui_sound("UISndRadarChatEnter"); // FIRE-6069: Radar alerts sounds LLAvatarNameCache::get(avId, boost::bind(&FSRadar::radarAlertMsg, this, _1, _2, message)); } @@ -453,7 +453,7 @@ void FSRadar::updateRadarList() { LLStringUtil::format_map_t args; args["DISTANCE"] = llformat("%3.2f", avRange); - std::string message = formatString(str_draw_distance_entering, args); + std::string message = format_string(str_draw_distance_entering, args); make_ui_sound("UISndRadarDrawEnter"); // FIRE-6069: Radar alerts sounds LLAvatarNameCache::get(avId, boost::bind(&FSRadar::radarAlertMsg, this, _1, _2, message)); } @@ -472,7 +472,7 @@ void FSRadar::updateRadarList() { LLStringUtil::format_map_t args; args["DISTANCE"] = llformat("%3.2f", avRange); - std::string message = formatString(str_region_entering_distance, args); + std::string message = format_string(str_region_entering_distance, args); LLAvatarNameCache::get(avId, boost::bind(&FSRadar::radarAlertMsg, this, _1, _2, message)); } else @@ -526,7 +526,7 @@ void FSRadar::updateRadarList() make_ui_sound("UISndRadarAgeAlert"); LLStringUtil::format_map_t args; args["AGE"] = llformat("%d", avAge); - std::string message = formatString(str_avatar_age_alert, args); + std::string message = format_string(str_avatar_age_alert, args); LLAvatarNameCache::get(avId, boost::bind(&FSRadar::radarAlertMsg, this, _1, _2, message)); } ent->mAgeAlertPerformed = true; @@ -980,7 +980,7 @@ void FSRadar::zoomAvatar(const LLUUID& avatar_id, const std::string& name) { LLStringUtil::format_map_t args; args["AVATARNAME"] = name.c_str(); - reportToNearbyChat(LLTrans::getString("camera_no_focus", args)); + report_to_nearby_chat(LLTrans::getString("camera_no_focus", args)); } } diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp index 760feac494..0ec821f6ab 100755 --- a/indra/newview/llagentcamera.cpp +++ b/indra/newview/llagentcamera.cpp @@ -2934,13 +2934,13 @@ void LLAgentCamera::loadCameraPosition() if (stored_camera_pos.isNull()) { - reportToNearbyChat(LLTrans::getString("LoadCameraPositionNoneSaved")); + report_to_nearby_chat(LLTrans::getString("LoadCameraPositionNoneSaved")); return; } if (dist_vec_squared(gAgent.getPositionGlobal(), stored_camera_pos) > far_clip_squared) { - reportToNearbyChat(LLTrans::getString("LoadCameraPositionOutsideDrawDistance")); + report_to_nearby_chat(LLTrans::getString("LoadCameraPositionOutsideDrawDistance")); return; } diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index e5322f3864..95a8d54510 100755 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -3019,7 +3019,7 @@ void LLIMMgr::addMessage( { LLStringUtil::format_map_t args; args["NAME"] = LLSLURL("group", new_session_id, "about").getSLURLString(); - reportToNearbyChat(LLTrans::getString("GroupChatMuteNotice", args)); + report_to_nearby_chat(LLTrans::getString("GroupChatMuteNotice", args)); } clearPendingInvitation(new_session_id); clearPendingAgentListUpdates(new_session_id); @@ -3103,7 +3103,7 @@ void LLIMMgr::addMessage( } else if (reportIgnoredAdHocSession) { - reportToNearbyChat(LLTrans::getString("IgnoredAdHocSession")); + report_to_nearby_chat(LLTrans::getString("IgnoredAdHocSession")); } return; } @@ -4339,7 +4339,7 @@ public: { LLStringUtil::format_map_t args; args["NAME"] = LLSLURL("group", session_id, "about").getSLURLString(); - reportToNearbyChat(LLTrans::getString("GroupChatMuteNotice", args)); + report_to_nearby_chat(LLTrans::getString("GroupChatMuteNotice", args)); } //KC: make sure we leave the group chat at the server end as well diff --git a/indra/newview/llmutelist.cpp b/indra/newview/llmutelist.cpp index 09c587b08d..63bb5cf7d3 100755 --- a/indra/newview/llmutelist.cpp +++ b/indra/newview/llmutelist.cpp @@ -355,7 +355,7 @@ void LLMuteList::updateAdd(const LLMute& mute) { LLStringUtil::format_map_t args; args["NAME"] = mute.mName; - reportToNearbyChat(LLTrans::getString("Mute_Add", args)); + report_to_nearby_chat(LLTrans::getString("Mute_Add", args)); } // } @@ -462,7 +462,7 @@ void LLMuteList::updateRemove(const LLMute& mute) { LLStringUtil::format_map_t args; args["NAME"] = mute.mName; - reportToNearbyChat(LLTrans::getString("Mute_Remove", args)); + report_to_nearby_chat(LLTrans::getString("Mute_Remove", args)); } // } diff --git a/indra/newview/llnetmap.cpp b/indra/newview/llnetmap.cpp index 87bdef33c9..1086962dce 100755 --- a/indra/newview/llnetmap.cpp +++ b/indra/newview/llnetmap.cpp @@ -1851,7 +1851,7 @@ void LLNetMap::handleCam() } else { - reportToNearbyChat(LLTrans::getString("minimap_no_focus")); + report_to_nearby_chat(LLTrans::getString("minimap_no_focus")); } } diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 3538686478..d8e6f74227 100755 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -388,13 +388,13 @@ public: { if (status == HTTP_INTERNAL_ERROR) { - reportToNearbyChat(LLTrans::getString("SLGridStatusTimedOut")); + report_to_nearby_chat(LLTrans::getString("SLGridStatusTimedOut")); } else { LLStringUtil::format_map_t args; args["STATUS"] = llformat("%d", status); - reportToNearbyChat(LLTrans::getString("SLGridStatusOtherError", args)); + report_to_nearby_chat(LLTrans::getString("SLGridStatusOtherError", args)); } LL_WARNS("SLGridStatusResponder") << "Error - status " << status << LL_ENDL; return; @@ -403,7 +403,7 @@ public: S32 outputSize = buffer->countAfter(channels.in(), NULL); if (outputSize <= 0) { - reportToNearbyChat(LLTrans::getString("SLGridStatusInvalidMsg")); + report_to_nearby_chat(LLTrans::getString("SLGridStatusInvalidMsg")); LL_WARNS("SLGridStatusResponder") << "Error - empty output" << LL_ENDL; return; } @@ -477,17 +477,17 @@ public: LLStringUtil::trim(newsTitle); LLStringUtil::trim(newsDesc); LLStringUtil::trim(newsLink); - reportToNearbyChat("[ " + newsTitle + " ] " + newsDesc + " [ " + newsLink + " ]"); + report_to_nearby_chat("[ " + newsTitle + " ] " + newsDesc + " [ " + newsLink + " ]"); } else { - reportToNearbyChat(LLTrans::getString("SLGridStatusInvalidMsg")); + report_to_nearby_chat(LLTrans::getString("SLGridStatusInvalidMsg")); LL_WARNS("SLGridStatusResponder") << "Error - inner tag(s) missing" << LL_ENDL; } } else { - reportToNearbyChat(LLTrans::getString("SLGridStatusInvalidMsg")); + report_to_nearby_chat(LLTrans::getString("SLGridStatusInvalidMsg")); LL_WARNS("SLGridStatusResponder") << "Error - output without " << LL_ENDL; } } @@ -2898,7 +2898,7 @@ LLWorld::getInstance()->addRegion(gFirstSimHandle, gFirstSim, first_sim_size_x, // FIRE-6643 Display MOTD when login screens are disabled if (gSavedSettings.getBOOL("FSDisableLoginScreens")) { - reportToNearbyChat(gAgent.mMOTD); + report_to_nearby_chat(gAgent.mMOTD); } // // diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 58d333737a..a458947460 100755 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -830,16 +830,16 @@ class LLAdvancedToggleHUDInfo : public view_listener_t } else if ("badge" == info_type) { - reportToNearbyChat("Hippos!"); + report_to_nearby_chat("Hippos!"); } else if ("cookies" == info_type) { - reportToNearbyChat("Cookies!"); + report_to_nearby_chat("Cookies!"); } // else if ("motd" == info_type) { - reportToNearbyChat(gAgent.mMOTD); + report_to_nearby_chat(gAgent.mMOTD); } // return true; @@ -4450,11 +4450,11 @@ class FSSelfToggleMoveLock : public view_listener_t gSavedPerAccountSettings.setBOOL("UseMoveLock", new_value); if (new_value) { - reportToNearbyChat(LLTrans::getString("MovelockEnabling")); + report_to_nearby_chat(LLTrans::getString("MovelockEnabling")); } else { - reportToNearbyChat(LLTrans::getString("MovelockDisabling")); + report_to_nearby_chat(LLTrans::getString("MovelockDisabling")); } } #ifdef OPENSIM @@ -8750,7 +8750,7 @@ void handle_selected_texture_info(void*) //LLSD args; //args["MESSAGE"] = msg; //LLNotificationsUtil::add("SystemMessage", args); - reportToNearbyChat(msg); + report_to_nearby_chat(msg); // } } @@ -8966,13 +8966,13 @@ class LLAdvancedToggleDoubleClickTeleport: public view_listener_t if (checked) { gSavedSettings.setBOOL("DoubleClickTeleport", FALSE); - reportToNearbyChat(LLTrans::getString("DoubleClickTeleportDisabled")); + report_to_nearby_chat(LLTrans::getString("DoubleClickTeleportDisabled")); } else { gSavedSettings.setBOOL("DoubleClickTeleport", TRUE); gSavedSettings.setBOOL("DoubleClickAutoPilot", FALSE); - reportToNearbyChat(LLTrans::getString("DoubleClickTeleportEnabled")); + report_to_nearby_chat(LLTrans::getString("DoubleClickTeleportEnabled")); } return true; } @@ -9367,7 +9367,7 @@ class FSDumpSimulatorFeaturesToChat : public view_listener_t std::stringstream out_str; region->getSimulatorFeatures(sim_features); LLSDSerialize::toPrettyXML(sim_features, out_str); - reportToNearbyChat(out_str.str()); + report_to_nearby_chat(out_str.str()); } return true; } diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index c721398faf..5e7346ec42 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -6299,11 +6299,11 @@ void process_sim_stats(LLMessageSystem *msg, void **user_data) if (change_count > 0) { - reportToNearbyChat(formatString(increase_message, args)); + report_to_nearby_chat(format_string(increase_message, args)); } else if (change_count < 0) { - reportToNearbyChat(formatString(decrease_message, args)); + report_to_nearby_chat(format_string(decrease_message, args)); } } } @@ -7574,7 +7574,7 @@ bool attempt_standard_notification(LLMessageSystem* msgsystem) // make_ui_sound("UISndRestart"); - reportToNearbyChat(LLTrans::getString("FSRegionRestartInLocalChat")); // FIRE-6307: Region restart notices in local chat + report_to_nearby_chat(LLTrans::getString("FSRegionRestartInLocalChat")); // FIRE-6307: Region restart notices in local chat } // FIRE-9858: Kill annoying "Autopilot canceled" toast @@ -7799,7 +7799,7 @@ void process_alert_core(const std::string& message, BOOL modal) } make_ui_sound("UISndRestartOpenSim"); - reportToNearbyChat(LLTrans::getString("FSRegionRestartInLocalChat")); // FIRE-6307: Region restart notices in local chat + report_to_nearby_chat(LLTrans::getString("FSRegionRestartInLocalChat")); // FIRE-6307: Region restart notices in local chat return; } // @@ -7964,7 +7964,7 @@ void process_mean_collision_alert_message(LLMessageSystem *msgsystem, void **use action = LLTrans::getString("Collision_UnknownType", args); return; } - reportToNearbyChat(action); + report_to_nearby_chat(action); } // Nearby Chat Collision Messages // Report Collision Messages to scripts diff --git a/indra/newview/llviewerparcelmedia.cpp b/indra/newview/llviewerparcelmedia.cpp index 3181c26b4f..3111f54b61 100755 --- a/indra/newview/llviewerparcelmedia.cpp +++ b/indra/newview/llviewerparcelmedia.cpp @@ -49,7 +49,7 @@ #include "lltrans.h" #include "llvieweraudio.h" -#include "fscommon.h" // For media filter reportToNearbyChat +#include "fscommon.h" // For media filter report_to_nearby_chat // Static Variables @@ -926,7 +926,7 @@ void LLViewerParcelMedia::filterMediaUrl(LLParcel* parcel) { LLStringUtil::format_map_t format_args; format_args["[DOMAIN]"] = domain; - reportToNearbyChat(LLTrans::getString("MediaFilterMediaContentBlocked", format_args)); + report_to_nearby_chat(LLTrans::getString("MediaFilterMediaContentBlocked", format_args)); sMediaLastActionPlay = false; } else @@ -1007,7 +1007,7 @@ void callback_media_alert2(const LLSD ¬ification, const LLSD &response, LLPar LLViewerParcelMedia::saveDomainFilterList(); LLStringUtil::format_map_t format_args; format_args["[DOMAIN]"] = domain; - reportToNearbyChat(LLTrans::getString("MediaFilterMediaContentDomainAlwaysAllowed", format_args)); + report_to_nearby_chat(LLTrans::getString("MediaFilterMediaContentDomainAlwaysAllowed", format_args)); LLViewerParcelMedia::sCurrentMedia = *parcel; if (parcel->getName() == currentparcel->getName()) { @@ -1024,7 +1024,7 @@ void callback_media_alert2(const LLSD ¬ification, const LLSD &response, LLPar LLViewerParcelMedia::saveDomainFilterList(); LLStringUtil::format_map_t format_args; format_args["[DOMAIN]"] = domain; - reportToNearbyChat(LLTrans::getString("MediaFilterMediaContentDomainAlwaysBlocked", format_args)); + report_to_nearby_chat(LLTrans::getString("MediaFilterMediaContentDomainAlwaysBlocked", format_args)); } else if ((option == 2) && allow) // Whitelist URL { @@ -1035,7 +1035,7 @@ void callback_media_alert2(const LLSD ¬ification, const LLSD &response, LLPar LLViewerParcelMedia::saveDomainFilterList(); LLStringUtil::format_map_t format_args; format_args["[MEDIAURL]"] = media_url; - reportToNearbyChat(LLTrans::getString("MediaFilterMediaContentUrlAlwaysAllowed", format_args)); + report_to_nearby_chat(LLTrans::getString("MediaFilterMediaContentUrlAlwaysAllowed", format_args)); LLViewerParcelMedia::sCurrentMedia = *parcel; if (parcel->getName() == currentparcel->getName()) { @@ -1052,7 +1052,7 @@ void callback_media_alert2(const LLSD ¬ification, const LLSD &response, LLPar LLViewerParcelMedia::saveDomainFilterList(); LLStringUtil::format_map_t format_args; format_args["[MEDIAURL]"] = media_url; - reportToNearbyChat(LLTrans::getString("MediaFilterMediaContentUrlAlwaysBlocked", format_args)); + report_to_nearby_chat(LLTrans::getString("MediaFilterMediaContentUrlAlwaysBlocked", format_args)); } // We've dealt with the alert, so mark it as inactive. @@ -1132,7 +1132,7 @@ void callback_media_alert_single(const LLSD ¬ification, const LLSD &response, LLViewerParcelMedia::saveDomainFilterList(); LLStringUtil::format_map_t format_args; format_args["[DOMAIN]"] = domain; - reportToNearbyChat(LLTrans::getString("MediaFilterMediaContentDomainAlwaysBlocked", format_args)); + report_to_nearby_chat(LLTrans::getString("MediaFilterMediaContentDomainAlwaysBlocked", format_args)); } else if (option == 3) // Whitelist domain { @@ -1143,7 +1143,7 @@ void callback_media_alert_single(const LLSD ¬ification, const LLSD &response, LLViewerParcelMedia::saveDomainFilterList(); LLStringUtil::format_map_t format_args; format_args["[DOMAIN]"] = domain; - reportToNearbyChat(LLTrans::getString("MediaFilterMediaContentDomainAlwaysAllowed", format_args)); + report_to_nearby_chat(LLTrans::getString("MediaFilterMediaContentDomainAlwaysAllowed", format_args)); LLViewerParcelMedia::sCurrentMedia = *parcel; if (parcel->getName() == currentparcel->getName()) { @@ -1347,7 +1347,7 @@ void LLViewerParcelMedia::filterAudioUrl(std::string media_url) { LLStringUtil::format_map_t format_args; format_args["[DOMAIN]"] = domain; - reportToNearbyChat(LLTrans::getString("MediaFilterAudioContentBlocked", format_args)); + report_to_nearby_chat(LLTrans::getString("MediaFilterAudioContentBlocked", format_args)); LLViewerAudio::getInstance()->stopInternetStreamWithAutoFade(); sAudioLastActionPlay = false; } @@ -1430,7 +1430,7 @@ void callback_audio_alert2(const LLSD ¬ification, const LLSD &response, std:: LLViewerParcelMedia::saveDomainFilterList(); LLStringUtil::format_map_t format_args; format_args["[DOMAIN]"] = domain; - reportToNearbyChat(LLTrans::getString("MediaFilterAudioContentDomainAlwaysAllowed", format_args)); + report_to_nearby_chat(LLTrans::getString("MediaFilterAudioContentDomainAlwaysAllowed", format_args)); if (gAudiop != NULL) { LLViewerParcelMedia::sCurrentMusic = media_url; @@ -1447,7 +1447,7 @@ void callback_audio_alert2(const LLSD ¬ification, const LLSD &response, std:: LLViewerParcelMedia::saveDomainFilterList(); LLStringUtil::format_map_t format_args; format_args["[DOMAIN]"] = domain; - reportToNearbyChat(LLTrans::getString("MediaFilterAudioContentDomainAlwaysBlocked", format_args)); + report_to_nearby_chat(LLTrans::getString("MediaFilterAudioContentDomainAlwaysBlocked", format_args)); if (gAudiop != NULL) { LLViewerParcelMedia::sCurrentMusic = ""; @@ -1464,7 +1464,7 @@ void callback_audio_alert2(const LLSD ¬ification, const LLSD &response, std:: LLViewerParcelMedia::saveDomainFilterList(); LLStringUtil::format_map_t format_args; format_args["[MEDIAURL]"] = media_url; - reportToNearbyChat(LLTrans::getString("MediaFilterAudioContentUrlAlwaysAllowed", format_args)); + report_to_nearby_chat(LLTrans::getString("MediaFilterAudioContentUrlAlwaysAllowed", format_args)); if (gAudiop != NULL) { LLViewerParcelMedia::sCurrentMusic = media_url; @@ -1481,7 +1481,7 @@ void callback_audio_alert2(const LLSD ¬ification, const LLSD &response, std:: LLViewerParcelMedia::saveDomainFilterList(); LLStringUtil::format_map_t format_args; format_args["[MEDIAURL]"] = media_url; - reportToNearbyChat(LLTrans::getString("MediaFilterAudioContentUrlAlwaysBlocked", format_args)); + report_to_nearby_chat(LLTrans::getString("MediaFilterAudioContentUrlAlwaysBlocked", format_args)); if (gAudiop != NULL) { LLViewerParcelMedia::sCurrentMusic = ""; @@ -1567,7 +1567,7 @@ void callback_audio_alert_single(const LLSD ¬ification, const LLSD &response, LLViewerParcelMedia::saveDomainFilterList(); LLStringUtil::format_map_t format_args; format_args["[DOMAIN]"] = domain; - reportToNearbyChat(LLTrans::getString("MediaFilterAudioContentDomainAlwaysAllowed", format_args)); + report_to_nearby_chat(LLTrans::getString("MediaFilterAudioContentDomainAlwaysAllowed", format_args)); if (gAudiop != NULL) { LLViewerParcelMedia::sCurrentMusic = media_url; @@ -1584,7 +1584,7 @@ void callback_audio_alert_single(const LLSD ¬ification, const LLSD &response, LLViewerParcelMedia::saveDomainFilterList(); LLStringUtil::format_map_t format_args; format_args["[DOMAIN]"] = domain; - reportToNearbyChat(LLTrans::getString("MediaFilterAudioContentDomainAlwaysBlocked", format_args)); + report_to_nearby_chat(LLTrans::getString("MediaFilterAudioContentDomainAlwaysBlocked", format_args)); if (gAudiop != NULL) { LLViewerParcelMedia::sCurrentMusic = ""; @@ -1775,7 +1775,7 @@ void LLViewerParcelMedia::filterMOAPUrl(LLMediaDataClientObject *object, LLObjec { LLStringUtil::format_map_t format_args; format_args["[DOMAIN]"] = domain; - reportToNearbyChat(LLTrans::getString("MediaFilterSharedMediaContentBlocked", domain)); + report_to_nearby_chat(LLTrans::getString("MediaFilterSharedMediaContentBlocked", domain)); sAudioLastActionPlay = false; } else @@ -1849,7 +1849,7 @@ void callback_MOAP_alert2(const LLSD ¬ification, const LLSD &response, LLMedi LLViewerParcelMedia::saveDomainFilterList(); LLStringUtil::format_map_t format_args; format_args["[DOMAIN]"] = domain; - reportToNearbyChat(LLTrans::getString("MediaFilterSharedMediaContentDomainAlwaysAllowed", format_args)); + report_to_nearby_chat(LLTrans::getString("MediaFilterSharedMediaContentDomainAlwaysAllowed", format_args)); nav_object->doNavigate(object, texture_index, media_url); LLViewerParcelMedia::sCurrentMOAP = media_url; LLViewerParcelMedia::sMOAPLastActionPlay = true; @@ -1863,7 +1863,7 @@ void callback_MOAP_alert2(const LLSD ¬ification, const LLSD &response, LLMedi LLViewerParcelMedia::saveDomainFilterList(); LLStringUtil::format_map_t format_args; format_args["[DOMAIN]"] = domain; - reportToNearbyChat(LLTrans::getString("MediaFilterSharedMediaContentDomainAlwaysBlocked", format_args)); + report_to_nearby_chat(LLTrans::getString("MediaFilterSharedMediaContentDomainAlwaysBlocked", format_args)); LLViewerParcelMedia::sCurrentMOAP = ""; LLViewerParcelMedia::sMOAPLastActionPlay = false; } @@ -1876,7 +1876,7 @@ void callback_MOAP_alert2(const LLSD ¬ification, const LLSD &response, LLMedi LLViewerParcelMedia::saveDomainFilterList(); LLStringUtil::format_map_t format_args; format_args["[MEDIAURL]"] = media_url; - reportToNearbyChat(LLTrans::getString("MediaFilterSharedMediaContentUrlAlwaysAllowed", format_args)); + report_to_nearby_chat(LLTrans::getString("MediaFilterSharedMediaContentUrlAlwaysAllowed", format_args)); nav_object->doNavigate(object, texture_index, media_url); LLViewerParcelMedia::sCurrentMOAP = media_url; LLViewerParcelMedia::sMOAPLastActionPlay = true; @@ -1890,7 +1890,7 @@ void callback_MOAP_alert2(const LLSD ¬ification, const LLSD &response, LLMedi LLViewerParcelMedia::saveDomainFilterList(); LLStringUtil::format_map_t format_args; format_args["[MEDIAURL]"] = media_url; - reportToNearbyChat(LLTrans::getString("MediaFilterSharedMediaContentUrlAlwaysBlocked", format_args)); + report_to_nearby_chat(LLTrans::getString("MediaFilterSharedMediaContentUrlAlwaysBlocked", format_args)); LLViewerParcelMedia::sCurrentMOAP = ""; LLViewerParcelMedia::sMOAPLastActionPlay = false; } diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 4c57592bf5..fee9903bb1 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -4775,7 +4775,7 @@ BOOL LLViewerWindow::saveImageNumbered(LLImageFormatted *image, bool force_picke { LLStringUtil::format_map_t args; args["FILENAME"] = filepath; - reportToNearbyChat(LLTrans::getString("SnapshotSavedToDisk", args)); + report_to_nearby_chat(LLTrans::getString("SnapshotSavedToDisk", args)); } // return image->save(filepath); diff --git a/indra/newview/qtoolalign.cpp b/indra/newview/qtoolalign.cpp index e7805858aa..4c292eeed2 100644 --- a/indra/newview/qtoolalign.cpp +++ b/indra/newview/qtoolalign.cpp @@ -429,11 +429,11 @@ void QToolAlign::align() { if(AlignThread::sInstance) { - reportToNearbyChat(LLTrans::getString("qtool_still_busy")); + report_to_nearby_chat(LLTrans::getString("qtool_still_busy")); } else { - reportToNearbyChat(LLTrans::getString("qtool_busy")); + report_to_nearby_chat(LLTrans::getString("qtool_busy")); AlignThread::sInstance = new AlignThread(); AlignThread::sInstance->start(); } @@ -458,7 +458,7 @@ public: delete AlignThread::sInstance; AlignThread::sInstance = NULL; LLSelectMgr::getInstance()->sendMultipleUpdate(UPD_POSITION); - reportToNearbyChat(LLTrans::getString("qtool_done")); + report_to_nearby_chat(LLTrans::getString("qtool_done")); return TRUE; } }; diff --git a/indra/newview/streamtitledisplay.cpp b/indra/newview/streamtitledisplay.cpp index 90995219a4..7c9210e904 100644 --- a/indra/newview/streamtitledisplay.cpp +++ b/indra/newview/streamtitledisplay.cpp @@ -87,7 +87,7 @@ void StreamTitleDisplay::checkMetadata() if (ShowStreamMetadata > 1) { chat = LLTrans::getString("StreamtitleNowPlaying") + " " + chat; - reportToNearbyChat(chat); + report_to_nearby_chat(chat); } else if (ShowStreamMetadata == 1 && (mMetadata.has("TITLE") || mMetadata.has("ARTIST")))