summaryrefslogtreecommitdiff
path: root/indra/newview/llchiclet.h
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llchiclet.h')
-rw-r--r--indra/newview/llchiclet.h18
1 files changed, 12 insertions, 6 deletions
diff --git a/indra/newview/llchiclet.h b/indra/newview/llchiclet.h
index 52bd7dbc31..ef47b54333 100644
--- a/indra/newview/llchiclet.h
+++ b/indra/newview/llchiclet.h
@@ -275,7 +275,8 @@ public:
enum EType {
TYPE_UNKNOWN,
TYPE_IM,
- TYPE_GROUP
+ TYPE_GROUP,
+ TYPE_AD_HOC
};
/*virtual*/ ~LLIMChiclet() {};
@@ -548,9 +549,6 @@ public:
/*virtual*/ ~ LLNotificationChiclet();
- // Notification Chiclet Window
- void setNotificationChicletWindow(LLFloater* wnd) { mNotificationChicletWindow = wnd; }
-
// methods for updating a number of unread System or IM notifications
void incUreadSystemNotifications() { setCounter(++mUreadSystemNotifications + mUreadIMNotifications); }
void decUreadSystemNotifications() { setCounter(--mUreadSystemNotifications + mUreadIMNotifications); }
@@ -558,11 +556,12 @@ public:
void setToggleState(BOOL toggled);
protected:
+ // connect counter updaters to the corresponding signals
+ void connectCounterUpdatersToSignal(std::string notification_type);
+
LLNotificationChiclet(const Params& p);
friend class LLUICtrlFactory;
- LLFloater* mNotificationChicletWindow;
-
static S32 mUreadSystemNotifications;
static S32 mUreadIMNotifications;
@@ -644,6 +643,11 @@ public:
*/
void removeAll();
+ /*
+ * Scrolls the panel to the specified chiclet
+ */
+ void scrollToChiclet(const LLChiclet* chiclet);
+
boost::signals2::connection setChicletClickedCallback(
const commit_callback_t& cb);
@@ -814,6 +818,8 @@ T* LLChicletPanel::createChiclet(const LLUUID& session_id /*= LLUUID::null*/, S3
return NULL;
}
+ scrollToChiclet(chiclet);
+
chiclet->setSessionId(session_id);
return chiclet;