From d3536025fdb47955c02c897d8274b81d6f8eadbb Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Fri, 15 Aug 2008 23:45:08 -0500 Subject: Second Life viewer sources 1.18.3.3-RC --- linden/indra/SConstruct | 11 +++-- linden/indra/llcommon/llcommon_vc8.vcproj | 32 ++++++++++++-- linden/indra/llcommon/lllslconstants.h | 2 +- linden/indra/llcommon/llversionviewer.h | 2 +- linden/indra/llmath/llmath.vcproj | 3 -- linden/indra/llmath/llvolume.cpp | 43 ++++++++++-------- linden/indra/llmessage/llmessage.vcproj | 6 +++ linden/indra/llrender/llrender_vc8.vcproj | 16 +++++++ linden/indra/llui/llspinctrl.cpp | 5 +++ linden/indra/llui/llspinctrl.h | 4 +- linden/indra/llui/llui_vc8.vcproj | 4 ++ linden/indra/lscript/lscript_compile/indra.l | 2 +- .../lscript/lscript_library/lscript_library.cpp | 2 +- .../indra/newview/English.lproj/InfoPlist.strings | 4 +- linden/indra/newview/Info-SecondLife.plist | 2 +- linden/indra/newview/app_settings/keywords.ini | 2 +- linden/indra/newview/linux_tools/wrapper.sh | 1 + linden/indra/newview/llpanelgroupgeneral.cpp | 47 ++++++++++++++------ linden/indra/newview/llpanelgroupgeneral.h | 4 +- linden/indra/newview/lltracker.cpp | 51 ++++++++++------------ linden/indra/newview/newview.vcproj | 3 ++ linden/indra/newview/newview_vc8.vcproj | 12 +++++ linden/indra/newview/releasenotes.txt | 22 ++++++++-- linden/indra/newview/res/newViewRes.rc | 8 ++-- 24 files changed, 197 insertions(+), 91 deletions(-) (limited to 'linden/indra') diff --git a/linden/indra/SConstruct b/linden/indra/SConstruct index 6105759..9298f7a 100644 --- a/linden/indra/SConstruct +++ b/linden/indra/SConstruct @@ -90,8 +90,8 @@ opts.AddOptions( BoolOption('GSTREAMER', 'Enabled GStreamer support', True), BoolOption('COLORGCC', 'Enabled colorgcc', True), EnumOption('GRID', 'Client package\'s default grid', 'default', - allowed_values=('default', 'aditi', 'agni', 'dmz', 'durga', 'firstlook', 'ganga', 'shakti', 'siva', 'soma', 'uma', 'vaak')), - EnumOption('CHANNEL', 'Client package default channel', 'default', + allowed_values=('default', 'aditi', 'agni', 'dmz', 'durga', 'ganga', 'shakti', 'siva', 'soma', 'uma', 'vaak')), + EnumOption('CHANNEL', 'Client package\'s default channel', 'default', allowed_values=('default', 'Release', 'Release Candidate', 'WindLight')), BoolOption('ELFIO', 'Enabled enhanced backtraces with libELFIO symbol extraction support', True), BoolOption('STANDALONE', 'Build using system packages (implies OPENSOURCE)', False), @@ -685,15 +685,14 @@ for build_target in targets: if grid not in ['default', 'agni']: product_name += "_" + grid.upper() if channel not in ['default', 'Release']: - product_name += "_" + "".join(channel.upper().split()) - + product_name += "_" + "".join((channel.upper()).split()) package_name = product_name + '.tar.bz2' complete_channel = 'Second Life ' + channel cmd = 'rm -rf newview/%(pn)s* && newview/viewer_manifest.py --grid=%(grid)s --channel=\'%(ch)s\' --installer_name=%(pn)s --arch=%(arch)s' % { 'pn': product_name, 'grid':grid, - 'arch':arch, - 'ch':complete_channel} + 'ch':complete_channel, + 'arch':arch} env.Command('newview/' + package_name, 'newview/viewer_manifest.py', cmd) Depends('newview/' + package_name, output_bin + '-stripped') Depends('newview/' + package_name, output_crashlogger_bin + '-stripped') diff --git a/linden/indra/llcommon/llcommon_vc8.vcproj b/linden/indra/llcommon/llcommon_vc8.vcproj index 15371f5..28f45ca 100644 --- a/linden/indra/llcommon/llcommon_vc8.vcproj +++ b/linden/indra/llcommon/llcommon_vc8.vcproj @@ -241,6 +241,10 @@ > + + @@ -305,6 +309,10 @@ > + + @@ -451,6 +459,10 @@ > + + @@ -523,6 +535,10 @@ > + + @@ -587,15 +603,19 @@ > + + + + - - diff --git a/linden/indra/llmath/llvolume.cpp b/linden/indra/llmath/llvolume.cpp index 1a25b3d..7f2a663 100644 --- a/linden/indra/llmath/llvolume.cpp +++ b/linden/indra/llmath/llvolume.cpp @@ -78,6 +78,11 @@ const F32 TAPER_MAX = 1.f; const F32 SKEW_MIN = -0.95f; const F32 SKEW_MAX = 0.95f; +const S32 SCULPT_REZ_1 = 6; // changed from 4 to 6 - 6 looks round whereas 4 looks square +const S32 SCULPT_REZ_2 = 8; +const S32 SCULPT_REZ_3 = 16; +const S32 SCULPT_REZ_4 = 32; + BOOL check_same_clock_dir( const LLVector3& pt1, const LLVector3& pt2, const LLVector3& pt3, const LLVector3& norm) { LLVector3 test = (pt2-pt1)%(pt3-pt2); @@ -455,25 +460,27 @@ LLProfile::Face* LLProfile::addHole(BOOL flat, F32 sides, F32 offset, F32 box_ho } -F32 next_power_of_two(F32 value) -{ - S32 power = (S32)llceil((F32)log((double)value)/(F32)log(2.0)); - return pow(2.0f, power); -} - -F32 nearest_power_of_two(F32 value) +S32 sculpt_sides(F32 detail) { - // nearest in the linear sense means closest w/r/t a "halfway" point. - // in the exponential sense, the "halfway" point isn't 1/2, it's 1/sqrt(2). - // our windows build hates the math.h defines, so do it here. -qarl - F32 const INVSQRT2 = 0.7071067812f; + // detail is usually one of: 1, 1.5, 2.5, 4.0. - F32 answer = next_power_of_two(value * INVSQRT2); - - // llwarns << value << " -> " << answer << llendl; - - return answer; + if (detail <= 1.0) + { + return SCULPT_REZ_1; + } + if (detail <= 2.0) + { + return SCULPT_REZ_2; + } + if (detail <= 3.0) + { + return SCULPT_REZ_3; + } + else + { + return SCULPT_REZ_4; + } } @@ -619,7 +626,7 @@ BOOL LLProfile::generate(BOOL path_open,F32 detail, S32 split, BOOL is_sculpted) S32 sides = (S32)circle_detail; if (is_sculpted) - sides = (S32)nearest_power_of_two((F32)sides - 1); + sides = sculpt_sides(detail); genNGon(sides); @@ -1166,7 +1173,7 @@ BOOL LLPath::generate(F32 detail, S32 split, BOOL is_sculpted) S32 sides = (S32)llfloor(llfloor((MIN_DETAIL_FACES * detail + twist_mag * 3.5f * (detail-0.5f))) * mParams.getRevolutions()); if (is_sculpted) - sides = (S32)nearest_power_of_two((F32)sides - 1); + sides = sculpt_sides(detail); genNGon(sides); } diff --git a/linden/indra/llmessage/llmessage.vcproj b/linden/indra/llmessage/llmessage.vcproj index bb404f0..dcc1202 100644 --- a/linden/indra/llmessage/llmessage.vcproj +++ b/linden/indra/llmessage/llmessage.vcproj @@ -482,9 +482,15 @@ RelativePath=".\llmail.h"> + + + + + + + + + + + + diff --git a/linden/indra/llui/llspinctrl.cpp b/linden/indra/llui/llspinctrl.cpp index 668ddfa..f587c80 100644 --- a/linden/indra/llui/llspinctrl.cpp +++ b/linden/indra/llui/llspinctrl.cpp @@ -547,3 +547,8 @@ LLView* LLSpinCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory * return spinner; } + +BOOL LLSpinCtrl::isDirty() const +{ + return( mValue != mInitialValue ); +} diff --git a/linden/indra/llui/llspinctrl.h b/linden/indra/llui/llspinctrl.h index dcc305e..c854ff0 100644 --- a/linden/indra/llui/llspinctrl.h +++ b/linden/indra/llui/llspinctrl.h @@ -76,7 +76,7 @@ public: virtual void setValue(const LLSD& value ); virtual LLSD getValue() const; F32 get() { return (F32)getValue().asReal(); } - void set(F32 value) { setValue(value); } + void set(F32 value) { setValue(value); mInitialValue = value; } virtual void setMinValue(LLSD min_value) { setMinValue((F32)min_value.asReal()); } virtual void setMaxValue(LLSD max_value) { setMaxValue((F32)max_value.asReal()); } @@ -86,6 +86,8 @@ public: virtual void setEnabled( BOOL b ); virtual void setFocus( BOOL b ); virtual void clear(); + virtual BOOL isDirty() const; + virtual void setPrecision(S32 precision); virtual void setMinValue(F32 min) { mMinValue = min; } virtual void setMaxValue(F32 max) { mMaxValue = max; } diff --git a/linden/indra/llui/llui_vc8.vcproj b/linden/indra/llui/llui_vc8.vcproj index a78c71c..096a755 100644 --- a/linden/indra/llui/llui_vc8.vcproj +++ b/linden/indra/llui/llui_vc8.vcproj @@ -440,6 +440,10 @@ > + + diff --git a/linden/indra/lscript/lscript_compile/indra.l b/linden/indra/lscript/lscript_compile/indra.l index afd7e1a..de5ba11 100644 --- a/linden/indra/lscript/lscript_compile/indra.l +++ b/linden/indra/lscript/lscript_compile/indra.l @@ -227,7 +227,7 @@ extern "C" { int yyerror(const char *fmt, ...); } "CHANGED_REGION" { count(); yylval.ival = 0x100; return(INTEGER_CONSTANT); } "CHANGED_TELEPORT" { count(); yylval.ival = 0x200; return(INTEGER_CONSTANT); } -"OBJECT_UNKOWN_DETAIL" { count(); yylval.ival = OBJECT_UNKOWN_DETAIL; return(INTEGER_CONSTANT); } +"OBJECT_UNKNOWN_DETAIL" { count(); yylval.ival = OBJECT_UNKNOWN_DETAIL; return(INTEGER_CONSTANT); } "OBJECT_NAME" { count(); yylval.ival = OBJECT_NAME; return(INTEGER_CONSTANT); } "OBJECT_DESC" { count(); yylval.ival = OBJECT_DESC; return(INTEGER_CONSTANT); } "OBJECT_POS" { count(); yylval.ival = OBJECT_POS; return(INTEGER_CONSTANT); } diff --git a/linden/indra/lscript/lscript_library/lscript_library.cpp b/linden/indra/lscript/lscript_library/lscript_library.cpp index 86fdd18..3f939c4 100644 --- a/linden/indra/lscript/lscript_library/lscript_library.cpp +++ b/linden/indra/lscript/lscript_library/lscript_library.cpp @@ -426,7 +426,7 @@ void LLScriptLibrary::init() addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llStringTrim", "s", "si", "string llStringTrim(string src, integer trim_type)\nTrim leading and/or trailing spaces from a string.\nUses trim_type of STRING_TRIM, STRING_TRIM_HEAD or STRING_TRIM_TAIL.")); addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llRegionSay", NULL, "is", "llRegionSay(integer channel, string msg)\nbroadcasts msg to entire region on channel (not 0.)")); - addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llGetObjectDetails", "l", "kl", "list llGetObjectDetails(key id, list params)\nGets the object details specified in params for the object with key id.\nDetails are OBJECT_DETAILS_NAME, _DESCRIPTION, _POS, _ROT, _VELOCITY, _OWNER, _GROUP, _CREATOR.")); + addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llGetObjectDetails", "l", "kl", "list llGetObjectDetails(key id, list params)\nGets the object details specified in params for the object with key id.\nDetails are OBJECT_NAME, _DESC, _POS, _ROT, _VELOCITY, _OWNER, _GROUP, _CREATOR.")); // energy, sleep, dummy_func, name, return type, parameters, help text, gods-only 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 @@ CFBundleVersion - 1.18.3.2 + 1.18.3.3 CSResourcesFileMapped 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"> + + + + @@ -1870,6 +1874,10 @@ > + + @@ -2750,6 +2758,10 @@ > + + 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" -- cgit v1.1