Second Life viewer sources 1.18.3.4-RC

7 files changed, 18 insertions, 9 deletions

diff --git a/linden/indra/newview/English.lproj/InfoPlist.strings b/linden/indra/newview/English.lproj/InfoPlist.strings
index 0b95b39..9b09bc3 100644
--- a/linden/indra/newview/English.lproj/InfoPlist.strings
+++ b/linden/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/linden/indra/newview/Info-SecondLife.plist b/linden/indra/newview/Info-SecondLife.plist
index e1e04be..955532b 100644
--- a/linden/indra/newview/Info-SecondLife.plist
+++ b/linden/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/linden/indra/newview/llpanelclassified.cpp b/linden/indra/newview/llpanelclassified.cpp
index 5f7bb6e..96adf06 100644
--- a/linden/indra/newview/llpanelclassified.cpp
+++ b/linden/indra/newview/llpanelclassified.cpp
@@ -100,6 +100,7 @@ LLPanelClassified::LLPanelClassified(BOOL in_finder)
         mInFinder(in_finder),
         mDirty(false),
         mForceClose(false),
+        mLocationChanged(false),
         mClassifiedID(),
         mCreatorID(),
         mPriceForListing(0),
@@ -575,6 +576,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);
@@ -765,6 +767,7 @@ void LLPanelClassified::confirmPublish(S32 option)
         mNameEditor->resetDirty();
         mDescEditor->resetDirty();
         mLocationEditor->resetDirty();
+        mLocationChanged = false;
         mCategoryCombo->resetDirty();
         mMatureCheck->resetDirty();
         mAutoRenewCheck->resetDirty();
@@ -839,6 +842,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();
@@ -854,6 +858,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/linden/indra/newview/llpanelclassified.h b/linden/indra/newview/llpanelclassified.h
index ec2d0b6..f0151df 100644
--- a/linden/indra/newview/llpanelclassified.h
+++ b/linden/indra/newview/llpanelclassified.h
@@ -117,6 +117,7 @@ protected:
         BOOL mInFinder;
         BOOL mDirty;
         bool mForceClose;
+        bool mLocationChanged;
         LLUUID mClassifiedID;
         LLUUID mRequestedID;
         LLUUID mCreatorID;
diff --git a/linden/indra/newview/llpanelgroupgeneral.cpp b/linden/indra/newview/llpanelgroupgeneral.cpp
index 1db306d..b443036 100644
--- a/linden/indra/newview/llpanelgroupgeneral.cpp
+++ b/linden/indra/newview/llpanelgroupgeneral.cpp
@@ -512,8 +512,6 @@ bool LLPanelGroupGeneral::apply(LLString& mesg)
         mChanged = FALSE;
         notifyObservers();
 
-        notifyObservers();
-
         return true;
 }
 
diff --git a/linden/indra/newview/releasenotes.txt b/linden/indra/newview/releasenotes.txt
index a9ea3f3..db83da9 100644
--- a/linden/indra/newview/releasenotes.txt
+++ b/linden/indra/newview/releasenotes.txt
@@ -1,3 +1,8 @@
+Release Notes for Second Life 1.18.3(4) September 14, 2007
+=====================================
+Bug fixes:
+* Fixed VWR-2378: Failure to enable the "Update" button in the profile/classifieds tab, after a "Set Location" update.
+
 Release Notes for Second Life 1.18.3(3) September 12, 2007
 =====================================
 Changes:
diff --git a/linden/indra/newview/res/newViewRes.rc b/linden/indra/newview/res/newViewRes.rc
index 04ed824..11cfe63 100644
--- a/linden/indra/newview/res/newViewRes.rc
+++ b/linden/indra/newview/res/newViewRes.rc
@@ -227,8 +227,8 @@ TOOLPIPETTE             CURSOR                  "toolpipette.cur"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,18,3,3
- PRODUCTVERSION 1,18,3,3
+ FILEVERSION 1,18,3,4
+ PRODUCTVERSION 1,18,3,4
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -245,12 +245,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Linden Lab"
             VALUE "FileDescription", "Second Life"
-            VALUE "FileVersion", "1.18.3.3"
+            VALUE "FileVersion", "1.18.3.4"
             VALUE "InternalName", "Second Life"
             VALUE "LegalCopyright", "Copyright © 2001-2007, Linden Research, Inc."
             VALUE "OriginalFilename", "SecondLife.exe"
             VALUE "ProductName", "Second Life"
-            VALUE "ProductVersion", "1.18.3.3"
+            VALUE "ProductVersion", "1.18.3.4"
         END
     END
     BLOCK "VarFileInfo"