Second Life viewer sources 1.18.3.3-RC

11 files changed, 101 insertions, 55 deletions

diff --git a/linden/indra/newview/English.lproj/InfoPlist.strings b/linden/indra/newview/English.lproj/InfoPlist.strings
index e622664..0b95b39 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.2";
-CFBundleGetInfoString = "Second Life version 1.18.3.2, Copyright 2004-2007 Linden Research, Inc.";
+CFBundleShortVersionString = "Second Life version 1.18.3.3";
+CFBundleGetInfoString = "Second Life version 1.18.3.3, Copyright 2004-2007 Linden Research, Inc.";
diff --git a/linden/indra/newview/Info-SecondLife.plist b/linden/indra/newview/Info-SecondLife.plist
index f4ac5c6..e1e04be 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.2</string>
+        <string>1.18.3.3</string>
         <key>CSResourcesFileMapped</key>
         <true/>
 </dict>
diff --git a/linden/indra/newview/app_settings/keywords.ini b/linden/indra/newview/app_settings/keywords.ini
index 4496ee7..5a68c5b 100644
--- a/linden/indra/newview/app_settings/keywords.ini
+++ b/linden/indra/newview/app_settings/keywords.ini
@@ -149,7 +149,7 @@ PSYS_SRC_PATTERN_ANGLE
 PSYS_SRC_PATTERN_ANGLE_CONE
 PSYS_SRC_PATTERN_ANGLE_CONE_EMPTY
 
-OBJECT_UNKOWN_DETAIL    Returned by llGetObjectDetails when passed an invalid object parameter type.
+OBJECT_UNKNOWN_DETAIL   Returned by llGetObjectDetails when passed an invalid object parameter type.
 OBJECT_NAME                             Used with llGetObjectDetails to get an object's name.
 OBJECT_DESC                             Used with llGetObjectDetails to get an object's description.
 OBJECT_POS                              Used with llGetObjectDetails to get an object's position.
diff --git a/linden/indra/newview/linux_tools/wrapper.sh b/linden/indra/newview/linux_tools/wrapper.sh
index 9adc4d3..fd15f21 100755
--- a/linden/indra/newview/linux_tools/wrapper.sh
+++ b/linden/indra/newview/linux_tools/wrapper.sh
@@ -38,6 +38,7 @@ export LL_GL_BASICEXT=x
 ##   you're building your own viewer, bear in mind that the executable
 ##   in the bin directory will be stripped: you should replace it with
 ##   an unstripped binary before you run.
+#export LL_WRAPPER='gdb --args'
 #export LL_WRAPPER='valgrind --smc-check=all --log-file=secondlife.vg --leak-check=full --suppressions=/usr/lib/valgrind/glibc-2.5.supp --suppressions=secondlife-i686.supp'
 
 ## - Avoids an often-buggy X feature that doesn't really benefit us anyway.
diff --git a/linden/indra/newview/llpanelgroupgeneral.cpp b/linden/indra/newview/llpanelgroupgeneral.cpp
index 8d30f09..1db306d 100644
--- a/linden/indra/newview/llpanelgroupgeneral.cpp
+++ b/linden/indra/newview/llpanelgroupgeneral.cpp
@@ -187,6 +187,7 @@ BOOL LLPanelGroupGeneral::postBuild()
         {
                 mSpinEnrollmentFee->setCommitCallback(onCommitAny);
                 mSpinEnrollmentFee->setCallbackUserData(this);
+                mSpinEnrollmentFee->setPrecision(0);
         }
 
         BOOL accept_notices = FALSE;
@@ -484,6 +485,8 @@ bool LLPanelGroupGeneral::apply(LLString& mesg)
                         else
                         {
                                 gdatap->mMaturePublish = FALSE;
+                                // Set to the used value, and reset initial value used for isdirty check
+                                mSpinEnrollmentFee->set( (F32)gdatap->mMembershipFee );
                         }
                 }
                 if (mCtrlShowInGroupList) gdatap->mShowInList = mCtrlShowInGroupList->get();
@@ -509,6 +512,8 @@ bool LLPanelGroupGeneral::apply(LLString& mesg)
         mChanged = FALSE;
         notifyObservers();
 
+        notifyObservers();
+
         return true;
 }
 
@@ -811,21 +816,35 @@ void LLPanelGroupGeneral::updateMembers()
         }
 }
 
-
 void LLPanelGroupGeneral::updateChanged()
 {
+        // List all the controls we want to check for changes...
+        LLUICtrl *check_list[] =
+        {
+                mGroupNameEditor,
+                mGroupName,
+                mFounderName,
+                mInsignia,
+                mEditCharter,
+                mCtrlShowInGroupList,
+                mCtrlPublishOnWeb, // To fix after merge: Erase this line, and uncomment the mCtrlListGroup line. -- Soft
+                mCtrlMature,
+                mCtrlOpenEnrollment,
+                mCtrlEnrollmentFee,
+                mSpinEnrollmentFee,
+                mCtrlReceiveNotices,
+//              mCtrlListGroup, // To fix after merge: See above comment -- Soft
+                mComboActiveTitle
+        };
+
         mChanged = FALSE;
-        if ( mGroupNameEditor )
-                mChanged  = mGroupNameEditor->isDirty();
-        if ( mGroupName )
-                mChanged |= mGroupName->isDirty();
-        if ( mFounderName )
-                mChanged |= mFounderName->isDirty();
-        if ( mInsignia )
-                mChanged |= mInsignia->isDirty();
-        if ( mEditCharter )
-                mChanged |= mEditCharter->isDirty();
-//      if ( mCtrlReceiveNotices )                      // "Receive group notices" is different, see onReceiveNotices()
-//              mChanged |= mCtrlReceiveNotices->isDirty();
-}
 
+        for( int i= 0; i< sizeof(check_list)/sizeof(*check_list); i++ )
+        {
+                if( check_list[i] && check_list[i]->isDirty() )
+                {
+                        mChanged = TRUE;
+                        break;
+                }
+        }
+}
diff --git a/linden/indra/newview/llpanelgroupgeneral.h b/linden/indra/newview/llpanelgroupgeneral.h
index a8615b2..07b8752 100644
--- a/linden/indra/newview/llpanelgroupgeneral.h
+++ b/linden/indra/newview/llpanelgroupgeneral.h
@@ -83,7 +83,7 @@ private:
         std::string             mConfirmGroupCreateStr;
         LLUUID                  mDefaultIconID;
 
-        // Group information
+        // Group information (include any updates in updateChanged)
         LLLineEditor            *mGroupNameEditor;
         LLTextBox                       *mGroupName;
         LLNameBox                       *mFounderName;
@@ -94,7 +94,7 @@ private:
 
         LLNameListCtrl  *mListVisibleMembers;
 
-        // Options
+        // Options (include any updates in updateChanged)
         LLCheckBoxCtrl  *mCtrlShowInGroupList;
         LLCheckBoxCtrl  *mCtrlPublishOnWeb;
         LLCheckBoxCtrl  *mCtrlMature;
diff --git a/linden/indra/newview/lltracker.cpp b/linden/indra/newview/lltracker.cpp
index feb4207..4125bb6 100644
--- a/linden/indra/newview/lltracker.cpp
+++ b/linden/indra/newview/lltracker.cpp
@@ -107,6 +107,15 @@ void LLTracker::stopTracking(void* userdata)
 // static virtual
 void LLTracker::drawHUDArrow()
 {
+        /* tracking autopilot destination has been disabled 
+           -- 2004.01.09, Leviathan
+        // Draw dot for autopilot target
+        if (gAgent.getAutoPilot())
+        {
+                instance()->drawMarker( gAgent.getAutoPilotTargetGlobal(), gTrackColor );
+                return;
+        }
+        */
         switch (getTrackingStatus())
         { 
         case TRACKING_AVATAR:
@@ -470,6 +479,7 @@ void LLTracker::renderBeacon(LLVector3d pos_global,
         if (dist > 0.99f * gCamera->getFar())
         {
                 color_frac = 0.4f;
+        //      pos_global = gAgent.getCameraPositionGlobal() + 0.99f*(gCamera->getFar()/dist)*to_vec;
         }
         else
         {
@@ -494,6 +504,7 @@ void LLTracker::renderBeacon(LLVector3d pos_global,
                 
                 draw_shockwave(1024.f, gRenderStartTime.getElapsedTimeF32(), 32, fogged_color);
 
+                //glScalef(1.f, 1.f, 1000.f);
                 glColor4fv(fogged_color.mV);
                 const U32 BEACON_VERTS = 256;
                 const F32 step = 1024.0f/BEACON_VERTS;
@@ -543,30 +554,24 @@ void LLTracker::renderBeacon(LLVector3d pos_global,
                         glEnd();
                 }
                                                         
+                //gCylinder.render(1000);
         glPopMatrix();
 
-        if (!gCamera || to_vec.magVec() > gCamera->getFar())
-        {
-                hud_textp->clearString();
-        }
-        else
-        {
-                char text[1024];                /* Flawfinder: ignore */
-                snprintf(text, sizeof(text), "%.0f m", to_vec.magVec());                /* Flawfinder: ignore */
+        char text[1024];                /* Flawfinder: ignore */
+        snprintf(text, sizeof(text), "%.0f m", to_vec.magVec());                /* Flawfinder: ignore */
 
-                LLWString wstr;
-                wstr += utf8str_to_wstring(label);
-                wstr += '\n';
-                wstr += utf8str_to_wstring(text);
+        LLWString wstr;
+        wstr += utf8str_to_wstring(label);
+        wstr += '\n';
+        wstr += utf8str_to_wstring(text);
 
-                hud_textp->setFont(LLFontGL::sSansSerif);
-                hud_textp->setZCompare(FALSE);
-                hud_textp->setColor(LLColor4(1.f, 1.f, 1.f, llmax(0.2f, llmin(1.f,(dist-FADE_DIST)/FADE_DIST))));
+        hud_textp->setFont(LLFontGL::sSansSerif);
+        hud_textp->setZCompare(FALSE);
+        hud_textp->setColor(LLColor4(1.f, 1.f, 1.f, llmax(0.2f, llmin(1.f,(dist-FADE_DIST)/FADE_DIST))));
 
-                hud_textp->setString(wstr);
-                hud_textp->setVertAlignment(LLHUDText::ALIGN_VERT_CENTER);
-                hud_textp->setPositionAgent(pos_agent);
-        }
+        hud_textp->setString(wstr);
+        hud_textp->setVertAlignment(LLHUDText::ALIGN_VERT_CENTER);
+        hud_textp->setPositionAgent(pos_agent);
 }
 
 
@@ -638,14 +643,6 @@ void LLTracker::drawMarker(const LLVector3d& pos_global, const LLColor4& color)
                 return;
         }
 
-        LLVector3d to_vec = pos_global - gAgent.getCameraPositionGlobal();
-        to_vec.mdV[2] = 0;
-
-        if (to_vec.magVec() > gCamera->getFar())
-        {       //only draw arrow if lateral distance to object is less than view distance.
-                return;
-        }
-
         // get position
         LLVector3 pos_local = gAgent.getPosAgentFromGlobal(pos_global);
 
diff --git a/linden/indra/newview/newview.vcproj b/linden/indra/newview/newview.vcproj
index 1ae7f8b..726f77a 100644
--- a/linden/indra/newview/newview.vcproj
+++ b/linden/indra/newview/newview.vcproj
@@ -1868,6 +1868,9 @@
                                 RelativePath=".\llpanelaudioprefs.h">
                         </File>
                         <File
+                                RelativePath=".\llpanelaudiovolume.h">
+                        </File>
+                        <File
                                 RelativePath=".\llpanelavatar.h">
                         </File>
                         <File
diff --git a/linden/indra/newview/newview_vc8.vcproj b/linden/indra/newview/newview_vc8.vcproj
index ba05819..635bb34 100644
--- a/linden/indra/newview/newview_vc8.vcproj
+++ b/linden/indra/newview/newview_vc8.vcproj
@@ -800,6 +800,10 @@
                                 >

                         </File>

                         <File

+                                RelativePath=".\llfloaterreleasemsg.cpp"

+                                >

+                        </File>

+                        <File

                                 RelativePath=".\llfloaterreporter.cpp"

                                 >

                         </File>

@@ -1870,6 +1874,10 @@
                                 >

                         </File>

                         <File

+                                RelativePath=".\llassetuploadresponders.h"

+                                >

+                        </File>

+                        <File

                                 RelativePath=".\llappearance.h"

                                 >

                         </File>

@@ -2750,6 +2758,10 @@
                                 >

                         </File>

                         <File

+                                RelativePath=".\llresourcedata.h"

+                                >

+                        </File>

+                        <File

                                 RelativePath=".\llrig.h"

                                 >

                         </File>

diff --git a/linden/indra/newview/releasenotes.txt b/linden/indra/newview/releasenotes.txt
index f4d6a8a..a9ea3f3 100644
--- a/linden/indra/newview/releasenotes.txt
+++ b/linden/indra/newview/releasenotes.txt
@@ -1,10 +1,24 @@
+Release Notes for Second Life 1.18.3(3) September 12, 2007
+=====================================
+Changes:
+* Reverted map beacon behavior (per VWR-2270)
+
+LSL changes:
+* VWR-2265: Mis-spelled LSL constant OBJECT_UNKOWN_DETAIL renamed to OBJECT_UNKNOWN_DETAIL
+** Scripts written with the old, mis-spelled constant will not recompile unless corrected
+
+Bug fixes:
+* Enrollment fees are no longer displayed with decimals
+* VWR-2275: Linux 1.18.3 Won't Link
+* VWR-2283: Some changes to groups cannot be saved
+* VWR-2324: llkdu.dll needs updating in RC viewer
+* VWR-2291: LOD defaults are now too aggressive in RC 1.18.3
+* VWR-2307: secondlife startup shell script needs a comment about gdb now
+
+
 Release Notes for Second Life 1.18.3(2) August 27, 2007
 =====================================
 Changes:
-* Altered beacon behavior
-** The beacon shaft is always drawn
-** The arrow is drawn if the lateral distance to the location being tracked is less than your view distance
-** The text appears if the total distance to the location being tracked is less than your view distance
 * Changed Bug Reporting links to http:// instead of https://
 * Build mode no longer automatically turns on beacons
 * Removed 'Ping User' in statistics window (was returning 0, as userserver no longer exists)
diff --git a/linden/indra/newview/res/newViewRes.rc b/linden/indra/newview/res/newViewRes.rc
index 78267b8..04ed824 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,2
- PRODUCTVERSION 1,18,3,2
+ FILEVERSION 1,18,3,3
+ PRODUCTVERSION 1,18,3,3
  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.2"
+            VALUE "FileVersion", "1.18.3.3"
             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.2"
+            VALUE "ProductVersion", "1.18.3.3"
         END
     END
     BLOCK "VarFileInfo"