summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
Diffstat (limited to 'indra')
-rwxr-xr-xindra/newview/llfloaterworldmap.cpp6
-rw-r--r--indra/newview/llfloaterworldmap.h2
-rw-r--r--indra/newview/llinventoryfilter.h4
-rw-r--r--indra/newview/llnotificationstorage.cpp22
-rw-r--r--indra/newview/llpanelmaininventory.cpp12
-rw-r--r--indra/newview/llvoicewebrtc.cpp9
-rw-r--r--indra/newview/skins/default/xui/en/floater_tools.xml8
-rw-r--r--indra/newview/skins/default/xui/en/floater_world_map.xml3
-rw-r--r--indra/newview/skins/default/xui/en/panel_tools_texture.xml4
9 files changed, 48 insertions, 22 deletions
diff --git a/indra/newview/llfloaterworldmap.cpp b/indra/newview/llfloaterworldmap.cpp
index 03979edbc1..87a9b91015 100755
--- a/indra/newview/llfloaterworldmap.cpp
+++ b/indra/newview/llfloaterworldmap.cpp
@@ -419,7 +419,7 @@ bool LLFloaterWorldMap::postBuild()
mEventsMatureCheck = getChild<LLCheckBoxCtrl>("events_mature_chk");
mEventsAdultCheck = getChild<LLCheckBoxCtrl>("events_adult_chk");
- mAvatarIcon = getChild<LLUICtrl>("avatar_icon");
+ mFriendAvatarIcon = getChild<LLUICtrl>("friends_icon");
mLandmarkIcon = getChild<LLUICtrl>("landmark_icon");
mLocationIcon = getChild<LLUICtrl>("location_icon");
@@ -610,11 +610,11 @@ void LLFloaterWorldMap::draw()
LLTracker::ETrackingStatus tracking_status = LLTracker::getTrackingStatus();
if (LLTracker::TRACKING_AVATAR == tracking_status)
{
- mAvatarIcon->setColor( map_track_color);
+ mFriendAvatarIcon->setColor( map_track_color);
}
else
{
- mAvatarIcon->setColor( map_track_disabled_color);
+ mFriendAvatarIcon->setColor( map_track_disabled_color);
}
if (LLTracker::TRACKING_LANDMARK == tracking_status)
diff --git a/indra/newview/llfloaterworldmap.h b/indra/newview/llfloaterworldmap.h
index 9558ca2615..00b5837df0 100644
--- a/indra/newview/llfloaterworldmap.h
+++ b/indra/newview/llfloaterworldmap.h
@@ -234,7 +234,7 @@ private:
LLCheckBoxCtrl* mEventsMatureCheck = nullptr;
LLCheckBoxCtrl* mEventsAdultCheck = nullptr;
- LLUICtrl* mAvatarIcon = nullptr;
+ LLUICtrl* mFriendAvatarIcon = nullptr;
LLUICtrl* mLandmarkIcon = nullptr;
LLUICtrl* mLocationIcon = nullptr;
diff --git a/indra/newview/llinventoryfilter.h b/indra/newview/llinventoryfilter.h
index c0164e04e4..6ff1c4839f 100644
--- a/indra/newview/llinventoryfilter.h
+++ b/indra/newview/llinventoryfilter.h
@@ -208,12 +208,14 @@ public:
Optional<FilterOps::Params> filter_ops;
Optional<std::string> substring;
Optional<bool> since_logoff;
+ Optional<S32> order;
Params()
: name("name"),
filter_ops(""),
substring("substring"),
- since_logoff("since_logoff")
+ since_logoff("since_logoff"),
+ order("order")
{}
};
diff --git a/indra/newview/llnotificationstorage.cpp b/indra/newview/llnotificationstorage.cpp
index 5cec35fc88..3fb922f93f 100644
--- a/indra/newview/llnotificationstorage.cpp
+++ b/indra/newview/llnotificationstorage.cpp
@@ -108,7 +108,10 @@ bool LLNotificationStorage::readNotifications(LLSD& pNotificationData, bool is_n
{
std::string filename = is_new_filename? mFileName : mOldFileName;
- LL_INFOS("LLNotificationStorage") << "starting read '" << filename << "'" << LL_ENDL;
+ if (!filename.empty())
+ {
+ LL_INFOS("LLNotificationStorage") << "starting read '" << filename << "'" << LL_ENDL;
+ }
bool didFileRead;
@@ -118,7 +121,17 @@ bool LLNotificationStorage::readNotifications(LLSD& pNotificationData, bool is_n
didFileRead = notifyFile.is_open();
if (!didFileRead)
{
- LL_WARNS("LLNotificationStorage") << "Failed to open file '" << filename << "'" << LL_ENDL;
+ if (!filename.empty())
+ {
+ if (LLFile::isfile(filename))
+ {
+ LL_WARNS("LLNotificationStorage") << "Failed to open file '" << filename << "'" << LL_ENDL;
+ }
+ else
+ {
+ LL_INFOS("LLNotificationStorage") << "File '" << filename << "' doesn't exist" << LL_ENDL;
+ }
+ }
}
else
{
@@ -144,7 +157,10 @@ bool LLNotificationStorage::readNotifications(LLSD& pNotificationData, bool is_n
if(didFileRead)
{
writeNotifications(pNotificationData);
- LLFile::remove(mOldFileName);
+ if (!mOldFileName.empty())
+ {
+ LLFile::remove(mOldFileName, ENOENT);
+ }
}
}
}
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 04eebcefc1..b8adb2d919 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -253,11 +253,21 @@ bool LLPanelMainInventory::postBuild()
LLParamSDParser parser;
parser.readSD(recent_items, p);
mRecentPanel->getFilter().fromParams(p);
- mRecentPanel->setSortOrder(gSavedSettings.getU32(LLInventoryPanel::RECENTITEMS_SORT_ORDER));
+
+ // Restore sort order if it was saved
+ if (p.order.isProvided())
+ {
+ mRecentPanel->setSortOrder(p.order());
+ }
+ else
+ {
+ mRecentPanel->setSortOrder(gSavedSettings.getU32(LLInventoryPanel::RECENTITEMS_SORT_ORDER));
+ }
}
}
if(mActivePanel)
{
+ // 'all items' tab
if(savedFilterState.has(mActivePanel->getFilter().getName()))
{
LLSD items = savedFilterState.get(mActivePanel->getFilter().getName());
diff --git a/indra/newview/llvoicewebrtc.cpp b/indra/newview/llvoicewebrtc.cpp
index 30803cdc7e..b2bb5990b1 100644
--- a/indra/newview/llvoicewebrtc.cpp
+++ b/indra/newview/llvoicewebrtc.cpp
@@ -3189,7 +3189,14 @@ void LLVoiceWebRTCConnection::OnDataReceivedImpl(const std::string &data, bool b
if (!mPrimary && isSpatial() && gAgent.getRegion())
{
is_primary_region = (mRegionID == gAgent.getRegion()->getRegionID());
- LL_WARNS() << "mPrimary is false, expected: " << is_primary_region << " connection state: " << getVoiceConnectionState() << LL_ENDL;
+ if (is_primary_region)
+ {
+ LL_WARNS("Voice") << "mPrimary is false, expected: true, connection state: " << getVoiceConnectionState() << LL_ENDL;
+ }
+ else
+ {
+ LL_INFOS("Voice") << "mPrimary is false, expected: false, connection state: " << getVoiceConnectionState() << LL_ENDL;
+ }
}
boost::json::object voice_data = voice_data_parsed.as_object();
boost::json::object mute;
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index d94a6c71b5..4fd50f3b3e 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -1559,9 +1559,7 @@ even though the user gets a free copy.
left_delta="0"
name="object_horizontal"
top_pad="10"
- width="95"
- font="DejaVu"
- font.size="LSmall" />
+ width="95" />
<menu_button
menu_filename="menu_copy_paste_pos.xml"
follows="top|left"
@@ -2651,9 +2649,7 @@ even though the user gets a free copy.
left="8"
name="object_horizontal"
top_pad="10"
- width="278"
- font="DejaVu"
- font.size="LSmall" />
+ width="278" />
<check_box
height="16"
label="Light"
diff --git a/indra/newview/skins/default/xui/en/floater_world_map.xml b/indra/newview/skins/default/xui/en/floater_world_map.xml
index 4e64b09c1e..b00890de6c 100644
--- a/indra/newview/skins/default/xui/en/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/en/floater_world_map.xml
@@ -637,7 +637,6 @@
Location:
</text>
<spinner
- control_name="Teleport_Coordinate_X"
decimal_digits="0"
follows="right|bottom"
height="23"
@@ -653,7 +652,6 @@
function="WMap.Coordinates" />
</spinner>
<spinner
- control_name="Teleport_Coordinate_Y"
decimal_digits="0"
follows="right|bottom"
height="23"
@@ -669,7 +667,6 @@
function="WMap.Coordinates" />
</spinner>
<spinner
- control_name="Teleport_Coordinate_Z"
decimal_digits="0"
follows="right|bottom"
height="23"
diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
index 5ff02de6f6..079aac3df1 100644
--- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
@@ -153,9 +153,7 @@
left="8"
name="object_horizontal"
top_pad="4"
- width="278"
- font="DejaVu"
- font.size="LSmall" />
+ width="278" />
<text
type="string"
length="1"
generated by cgit v1.3 (git 2.53.0) at 2026-10-22 13:42:48 +0000