1 files changed, 61 insertions, 57 deletions

diff --git a/linden/indra/newview/llpanelgroupgeneral.cpp b/linden/indra/newview/llpanelgroupgeneral.cpp
index 86cce51..cbf4a87 100644
--- a/linden/indra/newview/llpanelgroupgeneral.cpp
+++ b/linden/indra/newview/llpanelgroupgeneral.cpp
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -194,6 +195,7 @@ BOOL LLPanelGroupGeneral::postBuild()
                 mSpinEnrollmentFee->setCommitCallback(onCommitAny);
                 mSpinEnrollmentFee->setCallbackUserData(this);
                 mSpinEnrollmentFee->setPrecision(0);
+                mSpinEnrollmentFee->resetDirty();
         }
 
         BOOL accept_notices = FALSE;
@@ -220,6 +222,7 @@ BOOL LLPanelGroupGeneral::postBuild()
                 mCtrlListGroup->setCallbackUserData(this);
                 mCtrlListGroup->set(list_in_profile);
                 mCtrlListGroup->setEnabled(data.mID.notNull());
+                mCtrlListGroup->resetDirty();
         }
 
         mActiveTitleLabel = getChild<LLTextBox>("active_title_label", recurse);
@@ -229,6 +232,7 @@ BOOL LLPanelGroupGeneral::postBuild()
         {
                 mComboActiveTitle->setCommitCallback(onCommitTitle);
                 mComboActiveTitle->setCallbackUserData(this);
+                mComboActiveTitle->resetDirty();
         }
 
         mIncompleteMemberDataStr = getString("incomplete_member_data_str");
@@ -258,7 +262,7 @@ BOOL LLPanelGroupGeneral::postBuild()
 void LLPanelGroupGeneral::onFocusEdit(LLFocusableElement* ctrl, void* data)
 {
         LLPanelGroupGeneral* self = (LLPanelGroupGeneral*)data;
-        self->mChanged = TRUE;
+        self->updateChanged();
         self->notifyObservers();
 }
 
@@ -316,6 +320,7 @@ void LLPanelGroupGeneral::onCommitTitle(LLUICtrl* ctrl, void* data)
         if (self->mGroupID.isNull() || !self->mAllowEdit) return;
         LLGroupMgr::getInstance()->sendGroupTitleUpdate(self->mGroupID,self->mComboActiveTitle->getCurrentID());
         self->update(GC_TITLES);
+        self->mComboActiveTitle->resetDirty();
 }
 
 // static
@@ -344,18 +349,18 @@ void LLPanelGroupGeneral::onClickJoin(void *userdata)
         if (gdatap)
         {
                 S32 cost = gdatap->mMembershipFee;
-                LLStringUtil::format_map_t args;
-                args["[COST]"] = llformat("%d", cost);
-                
+                LLSD args;
+                args["COST"] = llformat("%d", cost);
+                LLSD payload;
+                payload["group_id"] = self->mGroupID;
+
                 if (can_afford_transaction(cost))
                 {
-                        gViewerWindow->alertXml("JoinGroupCanAfford", args,
-                                                LLPanelGroupGeneral::joinDlgCB,
-                                                self);
+                        LLNotifications::instance().add("JoinGroupCanAfford", args, payload, LLPanelGroupGeneral::joinDlgCB);
                 }
                 else
                 {
-                        gViewerWindow->alertXml("JoinGroupCannotAfford", args);
+                        LLNotifications::instance().add("JoinGroupCannotAfford", args, payload);
                 }
         }
         else
@@ -366,17 +371,18 @@ void LLPanelGroupGeneral::onClickJoin(void *userdata)
 }
 
 // static
-void LLPanelGroupGeneral::joinDlgCB(S32 which, void *userdata)
+bool LLPanelGroupGeneral::joinDlgCB(const LLSD& notification, const LLSD& response)
 {
-        LLPanelGroupGeneral* self = (LLPanelGroupGeneral*) userdata;
+        S32 option = LLNotification::getSelectedOption(notification, response);
 
-        if (which == 1 || !self)
+        if (option == 1)
         {
                 // user clicked cancel
-                return;
+                return false;
         }
 
-        LLGroupMgr::getInstance()->sendGroupMemberJoin(self->mGroupID);
+        LLGroupMgr::getInstance()->sendGroupMemberJoin(notification["payload"]["group_id"].asUUID());
+        return false;
 }
 
 // static
@@ -396,6 +402,7 @@ void LLPanelGroupGeneral::openProfile(void* data)
 
 bool LLPanelGroupGeneral::needsApply(std::string& mesg)
 { 
+        updateChanged();
         mesg = getString("group_info_unchanged");
         return mChanged || mGroupID.isNull();
 }
@@ -444,9 +451,8 @@ bool LLPanelGroupGeneral::apply(std::string& mesg)
                 if(mComboMature &&
                    mComboMature->getCurrentIndex() == DECLINE_TO_STATE)
                 {
-                        LLStringUtil::format_map_t args;
-                        gViewerWindow->alertXml("SetGroupMature", &callbackConfirmMatureApply,
-                                new LLHandle<LLPanel>(getHandle()));
+                        LLNotifications::instance().add("SetGroupMature", LLSD(), LLSD(), 
+                                                                                        boost::bind(&LLPanelGroupGeneral::confirmMatureApply, this, _1, _2));
                         return false;
                 }
 
@@ -464,10 +470,9 @@ bool LLPanelGroupGeneral::apply(std::string& mesg)
                                 return false;
                         }
 
-                        LLStringUtil::format_map_t args;
-                        args["[MESSAGE]"] = mConfirmGroupCreateStr;
-                        gViewerWindow->alertXml("GenericAlertYesCancel", args,
-                                createGroupCallback, new LLHandle<LLPanel>(getHandle()) );
+                        LLSD args;
+                        args["MESSAGE"] = mConfirmGroupCreateStr;
+                        LLNotifications::instance().add("GenericAlertYesCancel", args, LLSD(), boost::bind(&LLPanelGroupGeneral::createGroupCallback, this, _1, _2));
 
                         return false;
                 }
@@ -545,22 +550,10 @@ void LLPanelGroupGeneral::cancel()
         notifyObservers();
 }
 
-
-// static
-void LLPanelGroupGeneral::callbackConfirmMatureApply(S32 option, void* data)
-{
-        LLHandle<LLPanel>* handlep = (LLHandle<LLPanel>*)data;
-        LLPanelGroupGeneral* self = dynamic_cast<LLPanelGroupGeneral*>(handlep->get());
-        delete handlep;
-        if (self)
-        {
-                self->confirmMatureApply(option);
-        }
-}
-
 // invoked from callbackConfirmMature
-void LLPanelGroupGeneral::confirmMatureApply(S32 option)
+bool LLPanelGroupGeneral::confirmMatureApply(const LLSD& notification, const LLSD& response)
 {
+        S32 option = LLNotification::getSelectedOption(notification, response);
         // 0 == Yes
         // 1 == No
         // 2 == Cancel
@@ -573,39 +566,35 @@ void LLPanelGroupGeneral::confirmMatureApply(S32 option)
                 mComboMature->setCurrentByIndex(NON_MATURE_CONTENT);
                 break;
         default:
-                return;
+                return false;
         }
 
         // If we got here it means they set a valid value
         std::string mesg = "";
         apply(mesg);
+        return false;
 }
 
 // static
-void LLPanelGroupGeneral::createGroupCallback(S32 option, void* userdata)
+bool LLPanelGroupGeneral::createGroupCallback(const LLSD& notification, const LLSD& response)
 {
-        LLHandle<LLPanel> panel_handle = *(LLHandle<LLPanel>*)userdata;
-        delete (LLHandle<LLPanel>*)userdata;
-
-        LLPanelGroupGeneral* self = dynamic_cast<LLPanelGroupGeneral*>(panel_handle.get());
-        if (!self) return;
-
+        S32 option = LLNotification::getSelectedOption(notification, response);
         switch(option)
         {
         case 0:
                 {
                         // Yay!  We are making a new group!
-                        U32 enrollment_fee = (self->mCtrlEnrollmentFee->get() ? 
-                                                                        (U32) self->mSpinEnrollmentFee->get() : 0);
+                        U32 enrollment_fee = (mCtrlEnrollmentFee->get() ? 
+                                                                        (U32) mSpinEnrollmentFee->get() : 0);
                 
-                        LLGroupMgr::getInstance()->sendCreateGroupRequest(self->mGroupNameEditor->getText(),
-                                                                                                self->mEditCharter->getText(),
-                                                                                                self->mCtrlShowInGroupList->get(),
-                                                                                                self->mInsignia->getImageAssetID(),
+                        LLGroupMgr::getInstance()->sendCreateGroupRequest(mGroupNameEditor->getText(),
+                                                                                                mEditCharter->getText(),
+                                                                                                mCtrlShowInGroupList->get(),
+                                                                                                mInsignia->getImageAssetID(),
                                                                                                 enrollment_fee,
-                                                                                                self->mCtrlOpenEnrollment->get(),
+                                                                                                mCtrlOpenEnrollment->get(),
                                                                                                 false,
-                                                                                                self->mComboMature->getCurrentIndex() == MATURE_CONTENT);
+                                                                                                mComboMature->getCurrentIndex() == MATURE_CONTENT);
 
                 }
                 break;
@@ -613,6 +602,7 @@ void LLPanelGroupGeneral::createGroupCallback(S32 option, void* userdata)
         default:
                 break;
         }
+        return false;
 }
 
 static F32 sSDTime = 0.0f;
@@ -675,6 +665,8 @@ void LLPanelGroupGeneral::update(LLGroupChange gc)
                                 mComboActiveTitle->setCurrentByID(LLUUID::null);
                         }
                 }
+
+                mComboActiveTitle->resetDirty();
         }
 
         // If this was just a titles update, we are done.
@@ -689,6 +681,8 @@ void LLPanelGroupGeneral::update(LLGroupChange gc)
         {
                 mCtrlShowInGroupList->set(gdatap->mShowInList);
                 mCtrlShowInGroupList->setEnabled(mAllowEdit && can_change_ident);
+                mCtrlShowInGroupList->resetDirty();
+
         }
         if (mComboMature)
         {
@@ -702,24 +696,29 @@ void LLPanelGroupGeneral::update(LLGroupChange gc)
                 }
                 mComboMature->setEnabled(mAllowEdit && can_change_ident);
                 mComboMature->setVisible( !gAgent.isTeen() );
+                mComboMature->resetDirty();
         }
         if (mCtrlOpenEnrollment) 
         {
                 mCtrlOpenEnrollment->set(gdatap->mOpenEnrollment);
                 mCtrlOpenEnrollment->setEnabled(mAllowEdit && can_change_member_opts);
+                mCtrlOpenEnrollment->resetDirty();
         }
         if (mCtrlEnrollmentFee) 
         {       
                 mCtrlEnrollmentFee->set(gdatap->mMembershipFee > 0);
                 mCtrlEnrollmentFee->setEnabled(mAllowEdit && can_change_member_opts);
+                mCtrlEnrollmentFee->resetDirty();
         }
         
         if (mSpinEnrollmentFee)
         {
                 S32 fee = gdatap->mMembershipFee;
                 mSpinEnrollmentFee->set((F32)fee);
-                mSpinEnrollmentFee->setEnabled( mAllowEdit 
-                                                                && (fee > 0) && can_change_member_opts);
+                mSpinEnrollmentFee->setEnabled( mAllowEdit &&
+                                                (fee > 0) &&
+                                                can_change_member_opts);
+                mSpinEnrollmentFee->resetDirty();
         }
         if ( mBtnJoinGroup )
         {
@@ -748,8 +747,9 @@ void LLPanelGroupGeneral::update(LLGroupChange gc)
                 {
                         mCtrlReceiveNotices->setEnabled(mAllowEdit);
                 }
+                mCtrlReceiveNotices->resetDirty();
         }
-        
+
 
         if (mInsignia) mInsignia->setEnabled(mAllowEdit && can_change_ident);
         if (mEditCharter) mEditCharter->setEnabled(mAllowEdit && can_change_ident);
@@ -765,11 +765,15 @@ void LLPanelGroupGeneral::update(LLGroupChange gc)
                 }
                 else
                 {
-                        
                         mInsignia->setImageAssetID(mDefaultIconID);
                 }
         }
-        if (mEditCharter) mEditCharter->setText(gdatap->mCharter);
+
+        if (mEditCharter)
+        {
+                mEditCharter->setText(gdatap->mCharter);
+                mEditCharter->resetDirty();
+        }
         
         if (mListVisibleMembers)
         {
@@ -897,7 +901,7 @@ void LLPanelGroupGeneral::updateChanged()
 
         mChanged = FALSE;
 
-        for( int i= 0; i< sizeof(check_list)/sizeof(*check_list); i++ )
+        for( int i= 0; i< LL_ARRAY_SIZE(check_list); i++ )
         {
                 if( check_list[i] && check_list[i]->isDirty() )
                 {