diff --git a/indra/newview/llfloaternotificationstabbed.cpp b/indra/newview/llfloaternotificationstabbed.cpp index e48fd8d7f5f5face558ac415e6e4ffc895c39193..0df62917542aac44b8a4c4c2f4cc932b0fe6c4d6 100644 --- a/indra/newview/llfloaternotificationstabbed.cpp +++ b/indra/newview/llfloaternotificationstabbed.cpp @@ -120,7 +120,7 @@ LLFloaterNotificationsTabbed::~LLFloaterNotificationsTabbed() } //--------------------------------------------------------------------------------- -void LLFloaterNotificationsTabbed::removeItemByID(const LLUUID& id, std::string type) +void LLFloaterNotificationsTabbed::removeItemByID(const LLUUID& id, const std::string& type) { if(mNotificationsSeparator->removeItemByID(type, id)) { @@ -145,7 +145,7 @@ void LLFloaterNotificationsTabbed::removeItemByID(const LLUUID& id, std::string } //--------------------------------------------------------------------------------- -LLPanel * LLFloaterNotificationsTabbed::findItemByID(const LLUUID& id, std::string type) +LLPanel * LLFloaterNotificationsTabbed::findItemByID(const LLUUID& id, const std::string& type) { return mNotificationsSeparator->findItemByID(type, id); } @@ -265,7 +265,7 @@ void LLFloaterNotificationsTabbed::updateNotificationCounters() } //--------------------------------------------------------------------------------- -void LLFloaterNotificationsTabbed::addItem(LLNotificationListItem::Params p) +void LLFloaterNotificationsTabbed::addItem(const LLNotificationListItem::Params& p) { // do not add clones if (mNotificationsSeparator->findItemByID(p.notification_name, p.notification_id)) @@ -490,7 +490,7 @@ bool LLNotificationSeparator::addItem(std::string& tag, LLNotificationListItem* } //--------------------------------------------------------------------------------- -bool LLNotificationSeparator::removeItemByID(std::string& tag, const LLUUID& id) +bool LLNotificationSeparator::removeItemByID(const std::string& tag, const LLUUID& id) { notification_list_map_t::iterator it = mNotificationListMap.find(tag); if (it != mNotificationListMap.end()) @@ -521,7 +521,7 @@ U32 LLNotificationSeparator::size() const } //--------------------------------------------------------------------------------- -LLPanel* LLNotificationSeparator::findItemByID(std::string& tag, const LLUUID& id) +LLPanel* LLNotificationSeparator::findItemByID(const std::string& tag, const LLUUID& id) { notification_list_map_t::iterator it = mNotificationListMap.find(tag); if (it != mNotificationListMap.end()) diff --git a/indra/newview/llfloaternotificationstabbed.h b/indra/newview/llfloaternotificationstabbed.h index c0ad0949456185b66661f5d1c739c9854b331152..e3d6cfa74a6b7b103a95a96e498f81eef922da64 100644 --- a/indra/newview/llfloaternotificationstabbed.h +++ b/indra/newview/llfloaternotificationstabbed.h @@ -51,8 +51,8 @@ class LLNotificationSeparator void initTaggedList(const std::set<std::string>& tags, LLNotificationListView* list); void initUnTaggedList(LLNotificationListView* list); bool addItem(std::string& tag, LLNotificationListItem* item); - LLPanel* findItemByID(std::string& tag, const LLUUID& id); - bool removeItemByID(std::string& tag, const LLUUID& id); + LLPanel* findItemByID(const std::string& tag, const LLUUID& id); + bool removeItemByID(const std::string& tag, const LLUUID& id); void getItems(std::vector<LLNotificationListItem*>& items) const; U32 size() const; private: @@ -79,8 +79,8 @@ class LLFloaterNotificationsTabbed : public LLTransientDockableFloater bool isWindowEmpty(); // Operating with items - void removeItemByID(const LLUUID& id, std::string type); - LLPanel * findItemByID(const LLUUID& id, std::string type); + void removeItemByID(const LLUUID& id, const std::string& type); + LLPanel * findItemByID(const LLUUID& id, const std::string& type); void updateNotificationCounters(); void updateNotificationCounter(S32 panelIndex, S32 counterValue, std::string stringName); @@ -142,7 +142,7 @@ class LLFloaterNotificationsTabbed : public LLTransientDockableFloater // void initChannel(); void clearScreenChannels(); // Operating with items - void addItem(LLNotificationListItem::Params p); + void addItem(const LLNotificationListItem::Params& p); void getAllItemsOnCurrentTab(std::vector<LLPanel*>& items) const; // Closes all notifications and removes them from the Notification Well