svn merge -r 69597:70080 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-3-Viewer --> release

Merge patches made in the 1-18-3 RC iterations into the trunk.
* SL-55085 Login hangs if optional update is declined.
* SL-55123 Mac app icon missing from open source tarball
* SL-55121 Mac mouse cursors missing from open source tarball
* SL-54978 Remove duplicate code that snuck in during a patch merge
* SL-54633 VWR-2378: Failure to enable the "Update" button in the profile/classifieds tab, after a "Set Location" update
* Release notes/version numbers

7 files changed, 12 insertions, 8 deletions

diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h
index c6405a1b01..282e8a18c5 100644
--- a/indra/llcommon/llversionviewer.h
+++ b/indra/llcommon/llversionviewer.h
@@ -12,7 +12,7 @@
 const S32 LL_VERSION_MAJOR = 1;
 const S32 LL_VERSION_MINOR = 18;
 const S32 LL_VERSION_PATCH = 3;
-const S32 LL_VERSION_BUILD = 3;
+const S32 LL_VERSION_BUILD = 4;
 
 const char * const LL_CHANNEL = "Second Life Release";
 
diff --git a/indra/newview/English.lproj/InfoPlist.strings b/indra/newview/English.lproj/InfoPlist.strings
index 0b95b39824..9b09bc3b89 100644
--- a/indra/newview/English.lproj/InfoPlist.strings
+++ b/indra/newview/English.lproj/InfoPlist.strings
@@ -1,5 +1,5 @@
 /* Localized versions of Info.plist keys */
 
 CFBundleName = "Second Life";
-CFBundleShortVersionString = "Second Life version 1.18.3.3";
-CFBundleGetInfoString = "Second Life version 1.18.3.3, Copyright 2004-2007 Linden Research, Inc.";
+CFBundleShortVersionString = "Second Life version 1.18.3.4";
+CFBundleGetInfoString = "Second Life version 1.18.3.4, Copyright 2004-2007 Linden Research, Inc.";
diff --git a/indra/newview/Info-SecondLife.plist b/indra/newview/Info-SecondLife.plist
index e1e04be477..955532b239 100644
--- a/indra/newview/Info-SecondLife.plist
+++ b/indra/newview/Info-SecondLife.plist
@@ -32,7 +32,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.18.3.3</string>
+	<string>1.18.3.4</string>
 	<key>CSResourcesFileMapped</key>
 	<true/>
 </dict>
diff --git a/indra/newview/llpanelclassified.cpp b/indra/newview/llpanelclassified.cpp
index 4779470039..f4a27cd058 100644
--- a/indra/newview/llpanelclassified.cpp
+++ b/indra/newview/llpanelclassified.cpp
@@ -80,6 +80,7 @@ LLPanelClassified::LLPanelClassified(BOOL in_finder)
 	mInFinder(in_finder),
 	mDirty(false),
 	mForceClose(false),
+	mLocationChanged(false),
 	mClassifiedID(),
 	mCreatorID(),
 	mPriceForListing(0),
@@ -555,6 +556,7 @@ void LLPanelClassified::processClassifiedInfoReply(LLMessageSystem *msg, void **
         self->mDescEditor->setText(desc);
         self->mSnapshotCtrl->setImageAssetID(snapshot_id);
         self->mLocationEditor->setText(location_text);
+		self->mLocationChanged = false;
 
 		self->mCategoryCombo->setCurrentByIndex(category - 1);
 		self->mMatureCheck->set(mature);
@@ -745,6 +747,7 @@ void LLPanelClassified::confirmPublish(S32 option)
 	mNameEditor->resetDirty();
 	mDescEditor->resetDirty();
 	mLocationEditor->resetDirty();
+	mLocationChanged = false;
 	mCategoryCombo->resetDirty();
 	mMatureCheck->resetDirty();
 	mAutoRenewCheck->resetDirty();
@@ -819,6 +822,7 @@ void LLPanelClassified::onClickSet(void* data)
     location_text.append(llformat(" (%d, %d, %d)", region_x, region_y, region_z));
 
 	self->mLocationEditor->setText(location_text);
+	self->mLocationChanged = true;
 
 	// Set this to null so it updates on the next save.
 	self->mParcelID.setNull();
@@ -834,6 +838,7 @@ BOOL LLPanelClassified::checkDirty()
 	if	( mNameEditor )				mDirty |= mNameEditor->isDirty();
 	if	( mDescEditor )				mDirty |= mDescEditor->isDirty();
 	if	( mLocationEditor )			mDirty |= mLocationEditor->isDirty();
+	if  ( mLocationChanged )		mDirty |= TRUE;
 	if	( mCategoryCombo )			mDirty |= mCategoryCombo->isDirty();
 	if	( mMatureCheck )			mDirty |= mMatureCheck->isDirty();
 	if	( mAutoRenewCheck )			mDirty |= mAutoRenewCheck->isDirty();
diff --git a/indra/newview/llpanelclassified.h b/indra/newview/llpanelclassified.h
index 284016f149..7b5a669250 100644
--- a/indra/newview/llpanelclassified.h
+++ b/indra/newview/llpanelclassified.h
@@ -97,6 +97,7 @@ protected:
 	BOOL mInFinder;
 	BOOL mDirty;
 	bool mForceClose;
+	bool mLocationChanged;
 	LLUUID mClassifiedID;
 	LLUUID mRequestedID;
 	LLUUID mCreatorID;
diff --git a/indra/newview/llpanelgroupgeneral.cpp b/indra/newview/llpanelgroupgeneral.cpp
index 9139b01e0f..a2cc0f5a81 100644
--- a/indra/newview/llpanelgroupgeneral.cpp
+++ b/indra/newview/llpanelgroupgeneral.cpp
@@ -497,8 +497,6 @@ bool LLPanelGroupGeneral::apply(LLString& mesg)
 	mChanged = FALSE;
 	notifyObservers();
 
-	notifyObservers();
-
 	return true;
 }
 
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 8767b15715..fe17664c7d 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -2622,7 +2622,7 @@ void update_dialog_callback(S32 option, void *userdata)
 #if !LL_RELEASE_FOR_DOWNLOAD
 	if (option == 2)
 	{
-		LLStartUp::setStartupState( STATE_WORLD_INIT ); 
+		LLStartUp::setStartupState( STATE_LOGIN_AUTH_INIT ); 
 		return;
 	}
 #endif
@@ -2638,7 +2638,7 @@ void update_dialog_callback(S32 option, void *userdata)
 		}
 		else
 		{
-			LLStartUp::setStartupState( STATE_WORLD_INIT );
+			LLStartUp::setStartupState( STATE_LOGIN_AUTH_INIT );
 		}
 		return;
 	}