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

Buncha tinies

Browse Source 
Link name in inventory offer received chat message
Fix shupdate compile missing ; and include from two commits ago
Update links used in menu_viewer.xml, I have things to do today...
And move inventory button on toolbar to between favs and received
This commit is contained in:
Liru Færs
2020-02-07 08:48:15 -05:00
parent 44aec1384a
commit 9548270306
5 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llviewermessage.cpp
View File

@@ -1406,8 +1406,10 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
//don't spam them if they are getting flooded
if (check_offer_throttle(mFromName, true))
{
log_message = chatHistory_string + " " + LLTrans::getString("InvOfferGaveYou") + " " + mDesc + LLTrans::getString(".");
log_message = chatHistory_string + ' ' + LLTrans::getString("InvOfferGaveYou") + ' ' + mDesc + LLTrans::getString(".");
chat.mText = log_message;
chat.mURL = LLAvatarActions::getSLURL(mFromID);
chat.mFromName = mFromName;
LLFloaterChat::addChatHistory(chat);
}

5
indra/newview/shupdatechecker.cpp
View File

@@ -5,11 +5,10 @@
#include "llnotificationsutil.h"
#include "llversioninfo.h"
#include "llviewerwindow.h"
#include "llsdjson.h"
#include "llweb.h"
#include "llwindow.h"
#include <nlohmann/json.hpp>
void onNotifyButtonPress(const LLSD& notification, const LLSD& response, std::string name, std::string url)
{
@@ -93,7 +92,7 @@ public:
LL_WARNS() << "Failed to parse json string from body." << LL_ENDL;
// TODO: Should we say something here for the user?
}
else onCompleted(data[mType], mType == "release")
else onCompleted(data[mType], mType == "release");
}
protected:

2
indra/newview/skins/default/xui/en-us/floater_toolbar_prefs.xml
View File

@@ -76,11 +76,11 @@
<check_box bottom_delta="-20" label="Texture Console" name="texture_console_btn" follows="left|right" control_name="ToolbarVisibleTextureConsole"/>
<check_box bottom_delta="-20" label="Texture Category Console" name="texture_category_console_btn" follows="left|right" control_name="ToolbarVisibleTextureCategoryConsole" visibility_control="AuditTexture"/>
<check_box bottom_delta="-20" label="Texture Size Console" name="texture_size_console_btn" follows="left|right" control_name="ToolbarVisibleTextureSizeConsole" visibility_control="AuditTexture"/>
<check_box bottom_delta="-20" label="Inventory" name="directory_btn" follows="left|right" control_name="ToolbarVisibleInventory"/>
<check_box bottom_delta="-20" label="Default Avatars" name="default_avatars_btn" follows="left|right" control_name="ToolbarVisibleAvatar"/>
<check_box bottom_delta="-20" label="Make Outfit" name="make_outfit_btn" follows="left|right" control_name="ToolbarVisibleOutfit"/>
<check_box bottom_delta="-20" label="Outfits" name="outfits_btn" follows="left|right" control_name="ToolbarVisibleInventoryOutfits"/>
<check_box bottom_delta="-20" label="Favorites" name="favs_btn" follows="left|right" control_name="ToolbarVisibleInventoryFavs"/>
<check_box bottom_delta="-20" label="Inventory" name="inventory_btn" follows="left|right" control_name="ToolbarVisibleInventory"/>
<check_box bottom_delta="-20" label="Received Items" name="received_items_btn" follows="left|right" control_name="ToolbarVisibleInventoryReceivedItems"/>
<check_box bottom="-38" label="Marketplace Listings" name="marketplace_listings_btn" follows="left|right" control_name="ToolbarVisibleMarketplaceListings" left_delta="160"/>
<check_box bottom_delta="-20" label="Marketplace" name="marketplace_btn" follows="left|right" control_name="ToolbarVisibleMarketplace"/>

4
indra/newview/skins/default/xui/en-us/menu_viewer.xml
View File

@@ -598,12 +598,12 @@
<menu_item_call bottom="-232" enabled="true" height="19" label="Account History..." left="0"
mouse_opaque="true" name="Account History..." width="185">
<on_click function="PromptShowURL" name="AccountHistory_url"
userdata="WebLaunchAccountHistory,http://secondlife.com/account/transactions.php" />
userdata="WebLaunchAccountHistory,https://accounts.secondlife.com/transaction_history/" />
</menu_item_call>
<menu_item_call bottom="-267" enabled="true" height="19" label="Manage My Account..." left="0"
mouse_opaque="true" name="Manage My Account..." width="166">
<on_click function="PromptShowURL" name="ManageMyAccount_url"
userdata="WebLaunchJoinNow,http://secondlife.com/account/" />
userdata="WebLaunchJoinNow,https://secondlife.com/my/account/index.php" />
</menu_item_call>
<menu_item_call label="Marketplace" name="Marketplace">
<on_click function="ShowWebFloater" userdata="marketplace"/>

10
indra/newview/skins/default/xui/en-us/panel_toolbar.xml
View File

@@ -387,11 +387,6 @@
<button.commit_callback function="ShowFloater" parameter="texture size console"/>
</button>
</layout_panel>
<layout_panel name="panel13" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleInventory">
<button sound_flags="0" bottom="0" height="24" label="Inventory" image_overlay="icn_toolbar_inventory.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" name="inventory_btn" tool_tip="Your items. (Ctrl-I)" width="50" follows="left|right" control_name="ShowInventory">
<button.commit_callback function="ShowFloater" parameter="inventory"/>
</button>
</layout_panel>
<layout_panel name="panelavatar" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleAvatar">
<button sound_flags="0" bottom="0" height="24" label="Default Avatars" image_overlay="icn_toolbar_avatar.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" name="avatar_btn" width="50" follows="left|right">
<button.commit_callback function="ShowFloater" parameter="avatar"/>
@@ -412,6 +407,11 @@
<button.commit_callback function="ShowInvFloater.Type" parameter="favorite"/>
</button>
</layout_panel>
<layout_panel name="panel13" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleInventory">
<button sound_flags="0" bottom="0" height="24" label="Inventory" image_overlay="icn_toolbar_inventory.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" name="inventory_btn" tool_tip="Your items. (Ctrl-I)" width="50" follows="left|right" control_name="ShowInventory">
<button.commit_callback function="ShowFloater" parameter="inventory"/>
</button>
</layout_panel>
<layout_panel name="panelreceiveditems" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleInventoryReceivedItems">
<button sound_flags="0" bottom="0" height="24" label="Received Items" image_overlay="icn_toolbar_received_items.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" name="received_items_btn" width="50" follows="left|right">
<button.commit_callback function="ShowInvFloater.Type" parameter="inbox"/>