Commit 10d81d37 authored by Kitty Barnett's avatar Kitty Barnett
Browse files

Merged with .Catznip tip

--HG--
branch : Catznip
parents 32acb0c1 61388de2
4c96598948f0485816e4fcb9793dfaa0185c15cb
\ No newline at end of file
20d1cf2fbef1a6b192d61ab3bbe02fe5fd84dfec
\ No newline at end of file
e004787acc14f48d640f17ba89871f765f2b8cf0
\ No newline at end of file
dd1e1790c1f4b4b12fa4e8486259d10edfd91180
\ No newline at end of file
......@@ -8840,7 +8840,7 @@
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
<integer>0</integer>
</map>
<key>PostFirstLoginIntroURL</key>
<map>
......
......@@ -575,7 +575,9 @@ bool LLAvatarTracker::updateCallingCards(const LLUUID& buddy_id)
LLInventoryModel::cat_array_t cats;
LLInventoryModel::item_array_t items;
LLParticularBuddyCollector f(buddy_id);
gInventory.collectDescendentsIf(gInventory.getRootFolderID(), cats, items, LLInventoryModel::INCLUDE_TRASH, f);
const LLUUID idCallingCards = gInventory.findCategoryUUIDForType(LLFolderType::FT_CALLINGCARD);
gInventory.collectDescendentsIf(idCallingCards, cats, items, LLInventoryModel::EXCLUDE_TRASH, f);
for (LLInventoryModel::item_array_t::iterator itItem = items.begin(); itItem != items.end(); ++itItem)
gInventory.addChangedMask(LLInventoryObserver::LABEL, (*itItem)->getUUID());
......
......@@ -41,6 +41,7 @@ LLFloaterNotificationsFlat::~LLFloaterNotificationsFlat()
{
}
// virtual
BOOL LLFloaterNotificationsFlat::postBuild()
{
m_pMessageList = getChild<LLNotificationListView>("notification_list");
......@@ -55,6 +56,17 @@ BOOL LLFloaterNotificationsFlat::postBuild()
return LLFloaterNotifications::postBuild();
}
// virtual
void LLFloaterNotificationsFlat::onVisibilityChange(BOOL isVisible)
{
LLFloaterNotifications::onVisibilityChange(isVisible);
if ( (isVisible) && (m_NeedsSort) )
{
refreshSort();
}
}
bool LLFloaterNotificationsFlat::checkFilter(const LLNotificationListItem* pItem) const
{
bool fVisible = true;
......@@ -191,6 +203,19 @@ void LLFloaterNotificationsFlat::refreshFilter()
m_pMessageList->notify(LLSD().with("rearrange", LLSD()));
}
void LLFloaterNotificationsFlat::refreshSort()
{
if (getVisible())
{
m_pMessageList->sort();
m_NeedsSort = false;
}
else
{
m_NeedsSort = true;
}
}
bool LLFloaterNotificationsFlat::isWindowEmpty() const
{
// NOTE: consider all items, not just the visible ones
......@@ -202,7 +227,7 @@ bool LLFloaterNotificationsFlat::addNotification(LLNotificationListItem* pItem)
if (m_pMessageList->addNotification(pItem, false))
{
pItem->setVisible(checkFilter(pItem));
m_pMessageList->sort();
refreshSort();
return true;
}
return false;
......
......@@ -44,7 +44,8 @@ class LLFloaterNotificationsFlat : public LLFloaterNotifications
* Base class overrides
*/
public:
/*virtual*/ BOOL postBuild();
BOOL postBuild() override;
void onVisibilityChange(BOOL isVisible) override;
/*
* Helper functions
......@@ -62,6 +63,7 @@ class LLFloaterNotificationsFlat : public LLFloaterNotifications
bool checkFilter(const LLNotificationListItem* pItem) const;
void refreshFilter();
void refreshSort();
/*
* Pure virtual functions
......@@ -86,6 +88,7 @@ class LLFloaterNotificationsFlat : public LLFloaterNotifications
LLComboBox* m_pFilterType;
LLFilterEditor* m_pFilterText;
bool m_NeedsSort = false;
bool m_fSinceLogoff = false;
std::string m_strFilterText;
std::string m_strFilterType;
......
......@@ -865,7 +865,7 @@ bool idle_startup()
if (gLoginMenuBarView == NULL)
{
LL_DEBUGS("AppInit") << "initializing menu bar" << LL_ENDL;
initialize_spellcheck_menu();
// initialize_spellcheck_menu();
init_menus();
}
show_release_notes_if_required();
......@@ -2021,6 +2021,12 @@ bool idle_startup()
LLLandmark::registerCallbacks(msg);
display_startup();
// [SL:KB] - Patch: UI-Notifications | Checked: Catznip-6.1
// Create the inventory views
LL_INFOS() << "Creating Inventory Views" << LL_ENDL;
LLFloaterReg::getInstance("inventory");
display_startup();
// [/SL:KB]
// request mute list
LL_INFOS() << "Requesting Mute List" << LL_ENDL;
LLMuteList::getInstance()->requestFromServer(gAgent.getID());
......@@ -2033,10 +2039,10 @@ bool idle_startup()
LL_INFOS() << "Requesting Agent Data" << LL_ENDL;
gAgent.sendAgentDataUpdateRequest();
display_startup();
// Create the inventory views
LL_INFOS() << "Creating Inventory Views" << LL_ENDL;
LLFloaterReg::getInstance("inventory");
display_startup();
// // Create the inventory views
// LL_INFOS() << "Creating Inventory Views" << LL_ENDL;
// LLFloaterReg::getInstance("inventory");
// display_startup();
// [RLVa:KB] - Checked: RLVa-1.1.0
if (RlvHandler::isEnabled())
......
......@@ -2188,6 +2188,9 @@ void LLViewerWindow::initBase()
// Login screen and main_view.xml need edit menus for preferences and browser
LL_DEBUGS("AppInit") << "initializing edit menu" << LL_ENDL;
initialize_edit_menu();
// [SL:KB] - Patch: Misc-Spellcheck | Checked: Catznip-6.1
initialize_spellcheck_menu();
// [/Sl:KB]
// Create the floater view at the start so that other views can add children to it.
// (But wait to add it as a child of the root view so that it will be in front of the
......
......@@ -36,7 +36,7 @@ const S32 RLV_VERSION_BUILD_COMPAT = 0;
// Implementation version
const S32 RLVa_VERSION_MAJOR = 2;
const S32 RLVa_VERSION_MINOR = 2;
const S32 RLVa_VERSION_PATCH = 0;
const S32 RLVa_VERSION_PATCH = 2;
// Uncomment before a final release
//#define RLV_RELEASE
......@@ -180,6 +180,7 @@ enum ERlvBehaviour {
RLV_BHVR_DETACHTHIS, // "detachthis"
RLV_BHVR_DETACHTHISEXCEPT, // "detachthis_except"
RLV_BHVR_ADJUSTHEIGHT, // "adjustheight"
RLV_BHVR_GETHEIGHTOFFSET, // "getheightoffset"
RLV_BHVR_TPTO, // "tpto"
RLV_BHVR_VERSION, // "version"
RLV_BHVR_VERSIONNEW, // "versionnew"
......
......@@ -3366,6 +3366,19 @@ ERlvCmdRet RlvReplyHandler<RLV_BHVR_GETCOMMAND>::onCommand(const RlvCommand& rlv
return RLV_RET_SUCCESS;
}
// Handles: @getheightoffset=<channel>
template<> template<>
ERlvCmdRet RlvReplyHandler<RLV_BHVR_GETHEIGHTOFFSET>::onCommand(const RlvCommand& rlvCmd, std::string& strReply)
{
if (!rlvCmd.getOption().empty())
return RLV_RET_FAILED_OPTION;
else if (!isAgentAvatarValid())
return RLV_RET_FAILED_UNKNOWN;
strReply = llformat("%.2f", gAgentAvatarp->getHoverOffset()[VZ] * 100);
return RLV_RET_SUCCESS;
}
// Checked: 2010-03-09 (RLVa-1.2.0a) | Modified: RLVa-1.1.0f
ERlvCmdRet RlvHandler::onGetInv(const RlvCommand& rlvCmd, std::string& strReply) const
{
......
......@@ -288,6 +288,7 @@ RlvBehaviourDictionary::RlvBehaviourDictionary()
addEntry(new RlvReplyProcessor<RLV_BHVR_GETCAM_TEXTURES>("getcam_textures", RlvBehaviourInfo::BHVR_EXPERIMENTAL));
addEntry(new RlvReplyProcessor<RLV_BHVR_GETCOMMAND>("getcommand", RlvBehaviourInfo::BHVR_EXTENDED));
addEntry(new RlvBehaviourInfo("getgroup", RLV_BHVR_GETGROUP, RLV_TYPE_REPLY));
addEntry(new RlvReplyProcessor<RLV_BHVR_GETHEIGHTOFFSET>("getheightoffset", RlvBehaviourInfo::BHVR_EXTENDED));
addEntry(new RlvBehaviourInfo("getinv", RLV_BHVR_GETINV, RLV_TYPE_REPLY));
addEntry(new RlvBehaviourInfo("getinvworn", RLV_BHVR_GETINVWORN, RLV_TYPE_REPLY));
addEntry(new RlvBehaviourInfo("getoutfit", RLV_BHVR_GETOUTFIT, RLV_TYPE_REPLY));
......
......@@ -114,15 +114,15 @@
right="-8"/>
<layout_stack left="140" width="200" height="26" enabled="true" orientation="horizontal" follows="right" name="ButtonsStack">
<layout_panel width="93" height="30" enabled="true" orientation="horizontal" name="CondenseAllButtonPanel">
<layout_panel width="93" height="30" enabled="true" name="CondenseAllButtonPanel">
<button width="93" height="21" left="2" label="Collapse all" name="collapse_all_button">
</button>
</layout_panel>
<layout_panel width="6" height="30" enabled="true" orientation="horizontal" name="GapLayoutPanel">
<layout_panel width="6" height="30" enabled="true" name="GapLayoutPanel">
<panel width="5" height="21" left="2" label="Gap Panel" border="false" name="GapPanel">
</panel>
</layout_panel>
<layout_panel width="93" height="30" enabled="true" orientation="horizontal" name="DeleteAllButtonPanel">
<layout_panel width="93" height="30" enabled="true" name="DeleteAllButtonPanel">
<button width="93" height="21" left="0" label="Delete all" follows="right" name="delete_all_button">
</button>
</layout_panel>
......
......@@ -46,10 +46,13 @@
parameter="shownames" />
</menu_item_call>
<menu_item_call
enabled="false"
label="Pay"
name="Pay...">
<menu_item_call.on_click
function="PayObject" />
<menu_item_call.on_enable
function="EnablePayAvatar" />
</menu_item_call>
<menu_item_call
label="Add Friend"
......@@ -179,8 +182,6 @@
function="Tools.LookAtSelection"
parameter="zoom" />
</menu_item_call>
<menu_item_call.on_enable
function="EnablePayAvatar" />
<menu_item_separator
layout="topleft" name="Impostor seperator"/>
......
......@@ -3640,6 +3640,10 @@
label="Media Browser"
name="Media Browser"
shortcut="control|alt|shift|Z">
<menu_item_call.on_click
function="Advanced.WebContentTest"
parameter="http://duckduckgo.com"/>
</menu_item_call>
<menu_item_check
label="Region Restart Test..."
name="Region Restart Test">
......@@ -3650,10 +3654,6 @@
function="Floater.Toggle"
parameter="region_restarting" />
</menu_item_check>
<menu_item_call.on_click
function="Advanced.WebContentTest"
parameter="http://duckduckgo.com"/>
</menu_item_call>
<menu_item_call
label="FB Connect Test"
name="FB Connect Test">
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment