aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:22 -0500
committerJacek Antonelli2008-08-15 23:45:22 -0500
commit1e8e051fafa147fc3375bf7693c781e3be17b6d4 (patch)
tree071633b1e27b13f52619ea60a58338bfab34538a /linden/indra/newview
parentSecond Life viewer sources 1.18.6.0-RC (diff)
downloadmeta-impy-1e8e051fafa147fc3375bf7693c781e3be17b6d4.zip
meta-impy-1e8e051fafa147fc3375bf7693c781e3be17b6d4.tar.gz
meta-impy-1e8e051fafa147fc3375bf7693c781e3be17b6d4.tar.bz2
meta-impy-1e8e051fafa147fc3375bf7693c781e3be17b6d4.tar.xz
Second Life viewer sources 1.18.6.1-RC
Diffstat (limited to 'linden/indra/newview')
-rw-r--r--linden/indra/newview/CrashReporter.nib/classes.nib12
-rw-r--r--linden/indra/newview/CrashReporter.nib/info.nib14
-rw-r--r--linden/indra/newview/CrashReporter.nib/objects.xib83
-rw-r--r--linden/indra/newview/English.lproj/InfoPlist.strings4
-rw-r--r--linden/indra/newview/Info-SecondLife.plist2
-rw-r--r--linden/indra/newview/app_settings/colors_base.xml1
-rw-r--r--linden/indra/newview/llappviewer.cpp2
-rw-r--r--linden/indra/newview/llcontroldef.cpp1
-rw-r--r--linden/indra/newview/llfolderview.cpp31
-rw-r--r--linden/indra/newview/llfolderview.h3
-rw-r--r--linden/indra/newview/llpanelavatar.cpp9
-rw-r--r--linden/indra/newview/llpanellogin.cpp49
-rw-r--r--linden/indra/newview/llpanellogin.h9
-rw-r--r--linden/indra/newview/llselectmgr.cpp3
-rw-r--r--linden/indra/newview/llviewermenu.cpp2
-rw-r--r--linden/indra/newview/llviewermessage.cpp17
-rw-r--r--linden/indra/newview/llwebbrowserctrl.cpp15
-rw-r--r--linden/indra/newview/llwebbrowserctrl.h1
-rw-r--r--linden/indra/newview/macview.xcodeproj/project.pbxproj21
-rw-r--r--linden/indra/newview/newview.vcproj5
-rw-r--r--linden/indra/newview/newview_vc8.vcproj5
-rw-r--r--linden/indra/newview/releasenotes.txt14
-rw-r--r--linden/indra/newview/res/newViewRes.rc8
-rw-r--r--linden/indra/newview/skins/xui/en-us/menu_login.xml6
-rw-r--r--linden/indra/newview/skins/xui/en-us/panel_avatar.xml10
25 files changed, 234 insertions, 93 deletions
diff --git a/linden/indra/newview/CrashReporter.nib/classes.nib b/linden/indra/newview/CrashReporter.nib/classes.nib
index ea58db1..c4b887e 100644
--- a/linden/indra/newview/CrashReporter.nib/classes.nib
+++ b/linden/indra/newview/CrashReporter.nib/classes.nib
@@ -1,4 +1,8 @@
1{ 1<?xml version="1.0" encoding="UTF-8"?>
2IBClasses = (); 2<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3IBVersion = 1; 3<plist version="1.0">
4} 4<dict>
5 <key>IBVersion</key>
6 <string>1</string>
7</dict>
8</plist>
diff --git a/linden/indra/newview/CrashReporter.nib/info.nib b/linden/indra/newview/CrashReporter.nib/info.nib
index 8eba931..b541744 100644
--- a/linden/indra/newview/CrashReporter.nib/info.nib
+++ b/linden/indra/newview/CrashReporter.nib/info.nib
@@ -1,17 +1,19 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<?xml version="1.0" encoding="UTF-8"?>
2<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> 2<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3<plist version="1.0"> 3<plist version="1.0">
4<dict> 4<dict>
5 <key>IBDocumentLocation</key>
6 <string>791 275 476 367 0 0 1600 1178 </string>
7 <key>IBFramework Version</key> 5 <key>IBFramework Version</key>
8 <string>446.1</string> 6 <string>629</string>
7 <key>IBLastKnownRelativeProjectPath</key>
8 <string>../macview.xcodeproj</string>
9 <key>IBOldestOS</key>
10 <integer>5</integer>
9 <key>IBOpenObjects</key> 11 <key>IBOpenObjects</key>
10 <array> 12 <array>
11 <integer>166</integer> 13 <integer>193</integer>
12 </array> 14 </array>
13 <key>IBSystem Version</key> 15 <key>IBSystem Version</key>
14 <string>8R2218</string> 16 <string>9B18</string>
15 <key>targetFramework</key> 17 <key>targetFramework</key>
16 <string>IBCarbonFramework</string> 18 <string>IBCarbonFramework</string>
17</dict> 19</dict>
diff --git a/linden/indra/newview/CrashReporter.nib/objects.xib b/linden/indra/newview/CrashReporter.nib/objects.xib
index f62b8d5..1099f56 100644
--- a/linden/indra/newview/CrashReporter.nib/objects.xib
+++ b/linden/indra/newview/CrashReporter.nib/objects.xib
@@ -1,59 +1,59 @@
1<?xml version="1.0" standalone="yes"?> 1<?xml version="1.0" standalone="yes"?>
2<object class="NSIBObjectData"> 2<object class="NSIBObjectData">
3 <string name="targetFramework">IBCarbonFramework</string>
4 <object name="rootObject" class="NSCustomObject" id="1"> 3 <object name="rootObject" class="NSCustomObject" id="1">
5 <string name="customClass">NSApplication</string>
6 </object> 4 </object>
7 <array count="7" name="allObjects"> 5 <array count="7" name="allObjects">
6 <object class="IBCarbonStaticText" id="181">
7 <string name="title">Second Life appears to have crashed or frozen the last time it ran.&#10;&#10;This crash reporter collects information about your computer&apos;s hardware configuration, operating system, and some Second Life logs, all of which are used for debugging purposes only.&#10;&#10;In the space below, please briefly describe what you were doing or trying to do just prior to the crash. Thank you for your help!&#10;&#10;This report is NOT read by Customer Support. If you have billing or other questions, please go to: http://www.secondlife.com/support/&#10;&#10;If you don&apos;t wish to send Linden Lab a crash report, press Cancel.&#10;</string>
8 <string name="bounds">20 20 231 487 </string>
9 </object>
10 <object class="IBCarbonButton" id="183">
11 <ostype name="command">not!</ostype>
12 <int name="buttonType">2</int>
13 <string name="title">Don&apos;t Send</string>
14 <string name="bounds">414 390 434 487 </string>
15 </object>
16 <object class="IBCarbonRootControl" id="167">
17 <array count="5" name="subviews">
18 <reference idRef="181"/>
19 <object class="IBCarbonButton" id="182">
20 <ostype name="command">ok </ostype>
21 <string name="title">Send Report</string>
22 <string name="bounds">414 273 434 378 </string>
23 </object>
24 <reference idRef="183"/>
25 <object class="IBCarbonEditText" id="185">
26 <ostype name="controlSignature">text</ostype>
27 <boolean name="isUnicode">TRUE</boolean>
28 <string name="bounds">242 23 391 484 </string>
29 </object>
30 <object class="IBCarbonCheckBox" id="193">
31 <ostype name="controlSignature">remb</ostype>
32 <int name="initialState">1</int>
33 <string name="title">Remember This Choice</string>
34 <string name="bounds">415 20 433 186 </string>
35 </object>
36 </array>
37 <string name="bounds">0 0 454 507 </string>
38 </object>
8 <object class="IBCarbonWindow" id="166"> 39 <object class="IBCarbonWindow" id="166">
9 <string name="windowRect">257 653 711 1160 </string>
10 <string name="title">Second Life Crash Logger</string>
11 <object name="rootControl" class="IBCarbonRootControl" id="167">
12 <string name="bounds">0 0 454 507 </string>
13 <array count="5" name="subviews">
14 <object class="IBCarbonStaticText" id="181">
15 <string name="bounds">20 20 231 487 </string>
16 <string name="title">Second Life appears to have crashed or frozen the last time it ran.&#10;&#10;This crash reporter collects information about your computer&apos;s hardware configuration, operating system, and some Second Life logs, all of which are used for debugging purposes only.&#10;&#10;In the space below, please briefly describe what you were doing or trying to do just prior to the crash. Thank you for your help!&#10;&#10;This report is NOT read by Customer Support. If you have billing or other questions, please go to: http://www.secondlife.com/support/&#10;&#10;If you don&apos;t wish to send Linden Lab a crash report, press Cancel.&#10;</string>
17 </object>
18 <object class="IBCarbonButton" id="182">
19 <string name="bounds">414 273 434 378 </string>
20 <string name="title">Send Report</string>
21 <ostype name="command">ok </ostype>
22 </object>
23 <object class="IBCarbonButton" id="183">
24 <string name="bounds">414 390 434 487 </string>
25 <string name="title">Don&apos;t Send</string>
26 <ostype name="command">not!</ostype>
27 <int name="buttonType">2</int>
28 </object>
29 <object class="IBCarbonEditText" id="185">
30 <string name="bounds">242 23 391 484 </string>
31 <ostype name="controlSignature">text</ostype>
32 <boolean name="isUnicode">TRUE</boolean>
33 </object>
34 <object class="IBCarbonCheckBox" id="193">
35 <string name="bounds">415 20 433 186 </string>
36 <string name="title">Remember This Choice</string>
37 <ostype name="controlSignature">remb</ostype>
38 </object>
39 </array>
40 </object>
41 <int name="carbonWindowClass">2</int> 40 <int name="carbonWindowClass">2</int>
42 <int name="themeBrush">3</int> 41 <int name="themeBrush">3</int>
43 <int name="windowPosition">7</int> 42 <int name="windowPosition">7</int>
43 <string name="title">Second Life Crash Logger</string>
44 <reference name="rootControl" idRef="167"/>
45 <string name="windowRect">257 653 711 1160 </string>
46 <string name="ScreenRectAtEncodeTime">0 0 768 1024 </string>
44 </object> 47 </object>
45 <reference idRef="167"/>
46 <reference idRef="181"/>
47 <reference idRef="182"/>
48 <reference idRef="183"/>
49 <reference idRef="185"/>
50 <reference idRef="193"/> 48 <reference idRef="193"/>
49 <reference idRef="185"/>
50 <reference idRef="182"/>
51 </array> 51 </array>
52 <array count="7" name="allParents"> 52 <array count="7" name="allParents">
53 <reference idRef="1"/>
54 <reference idRef="166"/>
55 <reference idRef="167"/> 53 <reference idRef="167"/>
56 <reference idRef="167"/> 54 <reference idRef="167"/>
55 <reference idRef="166"/>
56 <reference idRef="1"/>
57 <reference idRef="167"/> 57 <reference idRef="167"/>
58 <reference idRef="167"/> 58 <reference idRef="167"/>
59 <reference idRef="167"/> 59 <reference idRef="167"/>
@@ -64,5 +64,6 @@
64 <string>File&apos;s Owner</string> 64 <string>File&apos;s Owner</string>
65 <reference idRef="1"/> 65 <reference idRef="1"/>
66 </dictionary> 66 </dictionary>
67 <string name="targetFramework">IBCarbonFramework</string>
67 <unsigned_int name="nextObjectID">194</unsigned_int> 68 <unsigned_int name="nextObjectID">194</unsigned_int>
68</object> 69</object>
diff --git a/linden/indra/newview/English.lproj/InfoPlist.strings b/linden/indra/newview/English.lproj/InfoPlist.strings
index 85f7e25..38cbbde 100644
--- a/linden/indra/newview/English.lproj/InfoPlist.strings
+++ b/linden/indra/newview/English.lproj/InfoPlist.strings
@@ -1,5 +1,5 @@
1/* Localized versions of Info.plist keys */ 1/* Localized versions of Info.plist keys */
2 2
3CFBundleName = "Second Life"; 3CFBundleName = "Second Life";
4CFBundleShortVersionString = "Second Life version 1.18.6.0"; 4CFBundleShortVersionString = "Second Life version 1.18.6.1";
5CFBundleGetInfoString = "Second Life version 1.18.6.0, Copyright 2004-2007 Linden Research, Inc."; 5CFBundleGetInfoString = "Second Life version 1.18.6.1, Copyright 2004-2007 Linden Research, Inc.";
diff --git a/linden/indra/newview/Info-SecondLife.plist b/linden/indra/newview/Info-SecondLife.plist
index 59822a1..62f1665 100644
--- a/linden/indra/newview/Info-SecondLife.plist
+++ b/linden/indra/newview/Info-SecondLife.plist
@@ -32,7 +32,7 @@
32 </dict> 32 </dict>
33 </array> 33 </array>
34 <key>CFBundleVersion</key> 34 <key>CFBundleVersion</key>
35 <string>1.18.6.0</string> 35 <string>1.18.6.1</string>
36 <key>CSResourcesFileMapped</key> 36 <key>CSResourcesFileMapped</key>
37 <true/> 37 <true/>
38</dict> 38</dict>
diff --git a/linden/indra/newview/app_settings/colors_base.xml b/linden/indra/newview/app_settings/colors_base.xml
index 5a9261b..5902a7d 100644
--- a/linden/indra/newview/app_settings/colors_base.xml
+++ b/linden/indra/newview/app_settings/colors_base.xml
@@ -169,4 +169,5 @@
169 169
170<FilterBackgroundColor value="0, 0, 20, 255"/> 170<FilterBackgroundColor value="0, 0, 20, 255"/>
171<FilterTextColor value="255, 200, 70, 255"/> 171<FilterTextColor value="255, 200, 70, 255"/>
172<FolderViewLoadingMessageTextColor value="240, 165, 90, 255"/>
172</settings> 173</settings>
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index 45eaaa9..e95180c 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -1003,7 +1003,7 @@ bool LLAppViewer::init()
1003 writeSystemInfo(); 1003 writeSystemInfo();
1004 1004
1005 // Build a string representing the current version number. 1005 // Build a string representing the current version number.
1006 gCurrentVersion = llformat("%d.%d.%d", LL_VERSION_MAJOR, LL_VERSION_MINOR, LL_VERSION_PATCH ); 1006 gCurrentVersion = llformat("%s %d.%d.%d.%d", gChannelName.c_str(), LL_VERSION_MAJOR, LL_VERSION_MINOR, LL_VERSION_PATCH, LL_VERSION_BUILD );
1007 1007
1008 // 1008 //
1009 // Load the feature tables 1009 // Load the feature tables
diff --git a/linden/indra/newview/llcontroldef.cpp b/linden/indra/newview/llcontroldef.cpp
index 66b5b92..45b8be3 100644
--- a/linden/indra/newview/llcontroldef.cpp
+++ b/linden/indra/newview/llcontroldef.cpp
@@ -188,6 +188,7 @@ void declare_settings()
188 gSavedSettings.declareBOOL("ShowEmptyFoldersWhenSearching", FALSE, "Shows folders that do not have any visible contents when applying a filter to inventory"); 188 gSavedSettings.declareBOOL("ShowEmptyFoldersWhenSearching", FALSE, "Shows folders that do not have any visible contents when applying a filter to inventory");
189 gSavedSettings.declareS32("FilterItemsPerFrame", 500, "Maximum number of inventory items to match against search filter every frame (lower to increase framerate while searching, higher to improve search speed)"); 189 gSavedSettings.declareS32("FilterItemsPerFrame", 500, "Maximum number of inventory items to match against search filter every frame (lower to increase framerate while searching, higher to improve search speed)");
190 gSavedSettings.declareBOOL("DebugInventoryFilters", FALSE, "Turn on debugging display for inventory filtering"); 190 gSavedSettings.declareBOOL("DebugInventoryFilters", FALSE, "Turn on debugging display for inventory filtering");
191 gSavedSettings.declareF32("FolderLoadingMessageWaitTime", 0.5f, "Seconds to wait before showing the LOADING... text in folder views");
191 192
192 //------------------------------------------------------------------------ 193 //------------------------------------------------------------------------
193 // Status bar 194 // Status bar
diff --git a/linden/indra/newview/llfolderview.cpp b/linden/indra/newview/llfolderview.cpp
index eb9addc..7d309a0 100644
--- a/linden/indra/newview/llfolderview.cpp
+++ b/linden/indra/newview/llfolderview.cpp
@@ -108,6 +108,7 @@ LLColor4 LLFolderViewItem::sHighlightBgColor;
108LLColor4 LLFolderViewItem::sHighlightFgColor; 108LLColor4 LLFolderViewItem::sHighlightFgColor;
109LLColor4 LLFolderViewItem::sFilterBGColor; 109LLColor4 LLFolderViewItem::sFilterBGColor;
110LLColor4 LLFolderViewItem::sFilterTextColor; 110LLColor4 LLFolderViewItem::sFilterTextColor;
111LLColor4 LLFolderViewItem::sLoadingMessageTextColor;
111 112
112// Default constructor 113// Default constructor
113LLFolderViewItem::LLFolderViewItem( const LLString& name, LLViewerImage* icon, 114LLFolderViewItem::LLFolderViewItem( const LLString& name, LLViewerImage* icon,
@@ -132,7 +133,8 @@ LLFolderViewItem::LLFolderViewItem( const LLString& name, LLViewerImage* icon,
132 mStringMatchOffset(LLString::npos), 133 mStringMatchOffset(LLString::npos),
133 mControlLabelRotation(0.f), 134 mControlLabelRotation(0.f),
134 mRoot( root ), 135 mRoot( root ),
135 mDragAndDropTarget(FALSE) 136 mDragAndDropTarget(FALSE),
137 mIsLoading(FALSE)
136{ 138{
137 setIcon(icon); 139 setIcon(icon);
138 if( !LLFolderViewItem::sFont ) 140 if( !LLFolderViewItem::sFont )
@@ -151,6 +153,7 @@ LLFolderViewItem::LLFolderViewItem( const LLString& name, LLViewerImage* icon,
151 LLFolderViewItem::sHighlightFgColor = gColors.getColor( "MenuItemHighlightFgColor" ); 153 LLFolderViewItem::sHighlightFgColor = gColors.getColor( "MenuItemHighlightFgColor" );
152 LLFolderViewItem::sFilterBGColor = gColors.getColor( "FilterBackgroundColor" ); 154 LLFolderViewItem::sFilterBGColor = gColors.getColor( "FilterBackgroundColor" );
153 LLFolderViewItem::sFilterTextColor = gColors.getColor( "FilterTextColor" ); 155 LLFolderViewItem::sFilterTextColor = gColors.getColor( "FilterTextColor" );
156 LLFolderViewItem::sLoadingMessageTextColor = gColors.getColor( "FolderViewLoadingMessageTextColor" );
154 157
155 mArrowImage = gImageList.getImage(LLUUID(gViewerArt.getString("folder_arrow.tga")), MIPMAP_FALSE, TRUE); 158 mArrowImage = gImageList.getImage(LLUUID(gViewerArt.getString("folder_arrow.tga")), MIPMAP_FALSE, TRUE);
156 mBoxImage = gImageList.getImage(LLUUID(gViewerArt.getString("rounded_square.tga")), MIPMAP_FALSE, TRUE); 159 mBoxImage = gImageList.getImage(LLUUID(gViewerArt.getString("rounded_square.tga")), MIPMAP_FALSE, TRUE);
@@ -933,6 +936,14 @@ void LLFolderViewItem::draw()
933 text_left = right_x; 936 text_left = right_x;
934 } 937 }
935 938
939
940 if ( mIsLoading && mTimeSinceRequestStart.getElapsedTimeF32() >= gSavedSettings.getF32("FolderLoadingMessageWaitTime") )
941 {
942 sFont->renderUTF8( "Loading... ", 0, text_left, y, sLoadingMessageTextColor,
943 LLFontGL::LEFT, LLFontGL::BOTTOM, mLabelStyle, S32_MAX, S32_MAX, &right_x, FALSE);
944 text_left = right_x;
945 }
946
936 sFont->renderUTF8( mLabel, 0, text_left, y, color, 947 sFont->renderUTF8( mLabel, 0, text_left, y, color,
937 LLFontGL::LEFT, LLFontGL::BOTTOM, mLabelStyle, 948 LLFontGL::LEFT, LLFontGL::BOTTOM, mLabelStyle,
938 S32_MAX, S32_MAX, &right_x, FALSE ); 949 S32_MAX, S32_MAX, &right_x, FALSE );
@@ -2197,6 +2208,24 @@ void LLFolderViewFolder::draw()
2197 mControlLabelRotation = lerp(mControlLabelRotation, 0.f, LLCriticalDamp::getInterpolant(0.025f)); 2208 mControlLabelRotation = lerp(mControlLabelRotation, 0.f, LLCriticalDamp::getInterpolant(0.025f));
2198 } 2209 }
2199 2210
2211 bool possibly_has_children = false;
2212 bool up_to_date = mListener && mListener->isUpToDate();
2213 if(!up_to_date && mListener && mListener->hasChildren()) // we know we have children but haven't fetched them (doesn't obey filter)
2214 {
2215 possibly_has_children = true;
2216 }
2217
2218
2219 BOOL loading = ( mIsOpen && possibly_has_children && !up_to_date );
2220
2221 if ( loading && !mIsLoading )
2222 {
2223 // Measure how long we've been in the loading state
2224 mTimeSinceRequestStart.reset();
2225 }
2226
2227 mIsLoading = loading;
2228
2200 LLFolderViewItem::draw(); 2229 LLFolderViewItem::draw();
2201 2230
2202 // draw children if root folder, or any other folder that is open or animating to closed state 2231 // draw children if root folder, or any other folder that is open or animating to closed state
diff --git a/linden/indra/newview/llfolderview.h b/linden/indra/newview/llfolderview.h
index dd0dd21..466aac4 100644
--- a/linden/indra/newview/llfolderview.h
+++ b/linden/indra/newview/llfolderview.h
@@ -323,6 +323,7 @@ protected:
323 static LLColor4 sHighlightFgColor; 323 static LLColor4 sHighlightFgColor;
324 static LLColor4 sFilterBGColor; 324 static LLColor4 sFilterBGColor;
325 static LLColor4 sFilterTextColor; 325 static LLColor4 sFilterTextColor;
326 static LLColor4 sLoadingMessageTextColor;
326 327
327 LLString mLabel; 328 LLString mLabel;
328 LLString mSearchableLabel; 329 LLString mSearchableLabel;
@@ -349,6 +350,8 @@ protected:
349 BOOL mDragAndDropTarget; 350 BOOL mDragAndDropTarget;
350 LLPointer<LLViewerImage> mArrowImage; 351 LLPointer<LLViewerImage> mArrowImage;
351 LLPointer<LLViewerImage> mBoxImage; 352 LLPointer<LLViewerImage> mBoxImage;
353 BOOL mIsLoading;
354 LLTimer mTimeSinceRequestStart;
352 355
353 // This function clears the currently selected item, and records 356 // This function clears the currently selected item, and records
354 // the specified selected item appropriately for display and use 357 // the specified selected item appropriately for display and use
diff --git a/linden/indra/newview/llpanelavatar.cpp b/linden/indra/newview/llpanelavatar.cpp
index 5b43497..18b8462 100644
--- a/linden/indra/newview/llpanelavatar.cpp
+++ b/linden/indra/newview/llpanelavatar.cpp
@@ -1876,16 +1876,13 @@ void LLPanelAvatar::processAvatarPropertiesReply(LLMessageSystem *msg, void**)
1876 payment_text = "NoPaymentInfoOnFile"; 1876 payment_text = "NoPaymentInfoOnFile";
1877 } 1877 }
1878 args["[PAYMENTINFO]"] = self->mPanelSecondLife->childGetValue(payment_text).asString(); 1878 args["[PAYMENTINFO]"] = self->mPanelSecondLife->childGetValue(payment_text).asString();
1879 LLString age_text = "NotAgeVerified"; 1879 LLString age_text = age_verified ? "AgeVerified" : "NotAgeVerified";
1880 if(age_verified) 1880 args["[AGEVERIFICATION]"] = self->mPanelSecondLife->childGetValue(age_text).asString();
1881 {
1882 age_text = "AgeVerified";
1883 }
1884 args["[PAYMENTINFO]"] += self->mPanelSecondLife->childGetValue(age_text).asString();
1885 } 1881 }
1886 else 1882 else
1887 { 1883 {
1888 args["[PAYMENTINFO]"] = " "; 1884 args["[PAYMENTINFO]"] = " ";
1885 args["[AGEVERIFICATION]"] = " ";
1889 } 1886 }
1890 LLString::format(caption_text, args); 1887 LLString::format(caption_text, args);
1891 } 1888 }
diff --git a/linden/indra/newview/llpanellogin.cpp b/linden/indra/newview/llpanellogin.cpp
index 3e64bba..c7f10fd 100644
--- a/linden/indra/newview/llpanellogin.cpp
+++ b/linden/indra/newview/llpanellogin.cpp
@@ -149,6 +149,13 @@ void LLLoginHandler::parse(const LLSD& queryMap)
149 gGridChoice = GRID_INFO_UMA; 149 gGridChoice = GRID_INFO_UMA;
150 } 150 }
151 151
152#if !LL_RELEASE_FOR_DOWNLOAD
153 if (gGridChoice > GRID_INFO_NONE && gGridChoice < GRID_INFO_LOCAL)
154 {
155 gSavedSettings.setS32("ServerChoice", gGridChoice);
156 }
157#endif
158
152 snprintf(gGridName, MAX_STRING, "%s", gGridInfo[gGridChoice].mName); /* Flawfinder: ignore */ 159 snprintf(gGridName, MAX_STRING, "%s", gGridInfo[gGridChoice].mName); /* Flawfinder: ignore */
153 LLAppViewer::instance()->resetURIs(); 160 LLAppViewer::instance()->resetURIs();
154 161
@@ -304,6 +311,9 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
304 LLWebBrowserCtrl* web_browser = LLUICtrlFactory::getWebBrowserCtrlByName(this, "login_html"); 311 LLWebBrowserCtrl* web_browser = LLUICtrlFactory::getWebBrowserCtrlByName(this, "login_html");
305 if ( web_browser ) 312 if ( web_browser )
306 { 313 {
314 // observe browser events
315 web_browser->addObserver( this );
316
307 // don't make it a tab stop until SL-27594 is fixed 317 // don't make it a tab stop until SL-27594 is fixed
308 web_browser->setTabStop(FALSE); 318 web_browser->setTabStop(FALSE);
309 319
@@ -329,7 +339,7 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
329 339
330 // kick off a request to grab the url manually 340 // kick off a request to grab the url manually
331 gResponsePtr = LLIamHereLogin::build( this ); 341 gResponsePtr = LLIamHereLogin::build( this );
332 LLHTTPClient::get( childGetValue( "real_url" ).asString(), gResponsePtr ); 342 LLHTTPClient::head( childGetValue( "real_url" ).asString(), gResponsePtr );
333 }; 343 };
334 #else 344 #else
335 mHtmlAvailable = FALSE; 345 mHtmlAvailable = FALSE;
@@ -351,20 +361,27 @@ void LLPanelLogin::setSiteIsAlive( bool alive )
351 361
352 // mark as available 362 // mark as available
353 mHtmlAvailable = TRUE; 363 mHtmlAvailable = TRUE;
354 }; 364 }
355 } 365 }
356 else 366 else
357 // the site is not available (missing page, server down, other badness) 367 // the site is not available (missing page, server down, other badness)
358 { 368 {
359 if ( web_browser ) 369 if ( web_browser )
360 { 370 {
361 // hide browser control (revealing default one) 371 // painfully build the path to the loading screen
362 web_browser->setVisible( FALSE ); 372 std::string loading_path( gDirUtilp->getExpandedFilename( LL_PATH_SKINS, "" ) );
373 loading_path.append( gDirUtilp->getDirDelimiter() );
374 loading_path.append( "html" );
375 loading_path.append( gDirUtilp->getDirDelimiter() );
376 loading_path.append( "loading-error" );
377 loading_path.append( gDirUtilp->getDirDelimiter() );
378 loading_path.append( "index.html" );
379 web_browser->navigateTo( loading_path.c_str() );
363 380
364 // mark as unavailable 381 // mark as available
365 mHtmlAvailable = FALSE; 382 mHtmlAvailable = TRUE;
366 }; 383 }
367 }; 384 }
368#else 385#else
369 mHtmlAvailable = FALSE; 386 mHtmlAvailable = FALSE;
370#endif 387#endif
@@ -655,6 +672,22 @@ void LLPanelLogin::loadLoginPage()
655 web_browser->navigateTo( oStr.str() ); 672 web_browser->navigateTo( oStr.str() );
656} 673}
657 674
675#if LL_LIBXUL_ENABLED
676void LLPanelLogin::onNavigateComplete( const EventType& eventIn )
677{
678 LLWebBrowserCtrl* web_browser = LLUICtrlFactory::getWebBrowserCtrlByName(sInstance, "login_html");
679 if (web_browser)
680 {
681 // *HACK HACK HACK HACK!
682 /* Stuff a Tab key into the browser now so that the first field will
683 ** get the focus! The embedded javascript on the page that properly
684 ** sets the initial focus in a real web browser is not working inside
685 ** the viewer, so this is an UGLY HACK WORKAROUND for now.
686 */
687 web_browser->handleKey(KEY_TAB, MASK_NONE, false);
688 }
689}
690#endif
658 691
659//--------------------------------------------------------------------------- 692//---------------------------------------------------------------------------
660// Protected methods 693// Protected methods
diff --git a/linden/indra/newview/llpanellogin.h b/linden/indra/newview/llpanellogin.h
index 191e88c..f2a58b7 100644
--- a/linden/indra/newview/llpanellogin.h
+++ b/linden/indra/newview/llpanellogin.h
@@ -39,6 +39,7 @@
39#include "llviewerimage.h" 39#include "llviewerimage.h"
40#include "llstring.h" 40#include "llstring.h"
41#include "llmd5.h" 41#include "llmd5.h"
42#include "llwebbrowserctrl.h"
42 43
43class LLTextBox; 44class LLTextBox;
44class LLLineEditor; 45class LLLineEditor;
@@ -64,6 +65,9 @@ extern LLLoginHandler gLoginHandler;
64 65
65class LLPanelLogin 66class LLPanelLogin
66: public LLPanel 67: public LLPanel
68#if LL_LIBXUL_ENABLED
69 , public LLWebBrowserCtrlObserver
70#endif
67{ 71{
68public: 72public:
69 LLPanelLogin(const LLRect &rect, BOOL show_server, 73 LLPanelLogin(const LLRect &rect, BOOL show_server,
@@ -89,6 +93,11 @@ public:
89private: 93private:
90 static void onClickQuit(void*); 94 static void onClickQuit(void*);
91 static void onClickVersion(void*); 95 static void onClickVersion(void*);
96
97#if LL_LIBXUL_ENABLED
98 // browser observer impls
99 virtual void onNavigateComplete( const EventType& eventIn );
100#endif
92 101
93private: 102private:
94 LLPointer<LLViewerImage> mLogoImage; 103 LLPointer<LLViewerImage> mLogoImage;
diff --git a/linden/indra/newview/llselectmgr.cpp b/linden/indra/newview/llselectmgr.cpp
index 3c29cfd..9b3808f 100644
--- a/linden/indra/newview/llselectmgr.cpp
+++ b/linden/indra/newview/llselectmgr.cpp
@@ -5825,7 +5825,8 @@ bool LLObjectSelection::applyToTEs(LLSelectedTEFunctor* func, bool firstonly)
5825 iterator nextiter = iter++; 5825 iterator nextiter = iter++;
5826 LLSelectNode* node = *nextiter; 5826 LLSelectNode* node = *nextiter;
5827 LLViewerObject* object = (*nextiter)->getObject(); 5827 LLViewerObject* object = (*nextiter)->getObject();
5828 for (S32 te = 0; te < object->getNumTEs(); ++te) 5828 S32 num_tes = llmin((S32)object->getNumTEs(), (S32)object->getNumFaces()); // avatars have TEs but no faces
5829 for (S32 te = 0; te < num_tes; ++te)
5829 { 5830 {
5830 if (node->isTESelected(te)) 5831 if (node->isTESelected(te))
5831 { 5832 {
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index a6fb7fa..22985b0 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -1072,7 +1072,7 @@ void init_client_menu(LLMenuGL* menu)
1072 &menu_check_control, 1072 &menu_check_control,
1073 (void*)"ShowConsoleWindow")); 1073 (void*)"ShowConsoleWindow"));
1074 1074
1075 if(gQAMode && !gInProductionGrid) 1075 if(gQAMode)// && !gInProductionGrid)
1076 { 1076 {
1077 LLMenuGL* sub = NULL; 1077 LLMenuGL* sub = NULL;
1078 sub = new LLMenuGL("Debugging"); 1078 sub = new LLMenuGL("Debugging");
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index 2011275..37e851c 100644
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -279,11 +279,6 @@ void process_logout_reply(LLMessageSystem* msg, void**)
279 llinfos << "process_logout_reply item not found: " << item_id << llendl; 279 llinfos << "process_logout_reply item not found: " << item_id << llendl;
280 } 280 }
281 } 281 }
282 if(!parents.empty())
283 {
284 gInventory.accountForUpdate(parents);
285 gInventory.notifyObservers();
286 }
287 LLAppViewer::instance()->forceQuit(); 282 LLAppViewer::instance()->forceQuit();
288} 283}
289 284
@@ -1335,7 +1330,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
1335 S32 binary_bucket_size; 1330 S32 binary_bucket_size;
1336 LLChat chat; 1331 LLChat chat;
1337 1332
1338 //*TODO:translate - need to fix the full name to first/last (maybe) 1333 // *TODO:translate - need to fix the full name to first/last (maybe)
1339 msg->getUUIDFast(_PREHASH_AgentData, _PREHASH_AgentID, from_id); 1334 msg->getUUIDFast(_PREHASH_AgentData, _PREHASH_AgentID, from_id);
1340 msg->getBOOLFast(_PREHASH_MessageBlock, _PREHASH_FromGroup, from_group); 1335 msg->getBOOLFast(_PREHASH_MessageBlock, _PREHASH_FromGroup, from_group);
1341 msg->getUUIDFast(_PREHASH_MessageBlock, _PREHASH_ToAgentID, to_id); 1336 msg->getUUIDFast(_PREHASH_MessageBlock, _PREHASH_ToAgentID, to_id);
@@ -1872,6 +1867,8 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
1872 1867
1873 case IM_GOTO_URL: 1868 case IM_GOTO_URL:
1874 { 1869 {
1870 // n.b. this is for URLs sent by the system, not for
1871 // URLs sent by scripts (i.e. llLoadURL)
1875 if (binary_bucket_size <= 0) 1872 if (binary_bucket_size <= 0)
1876 { 1873 {
1877 llwarns << "bad binary_bucket_size: " 1874 llwarns << "bad binary_bucket_size: "
@@ -5091,7 +5088,7 @@ void callback_load_url_name(const LLUUID& id, const char* first, const char* las
5091 owner_name += last; 5088 owner_name += last;
5092 } 5089 }
5093 5090
5094 // TODO: Talk to james about using an id instead of a name for this. 5091 // For legacy name-only mutes.
5095 if (gMuteListp->isMuted(LLUUID::null, owner_name)) 5092 if (gMuteListp->isMuted(LLUUID::null, owner_name))
5096 { 5093 {
5097 delete infop; 5094 delete infop;
@@ -5126,8 +5123,12 @@ void process_load_url(LLMessageSystem* msg, void**)
5126 // URL is safety checked in load_url above 5123 // URL is safety checked in load_url above
5127 5124
5128 // Check if object or owner is muted 5125 // Check if object or owner is muted
5129 if (gMuteListp->isMuted(infop->mObjectID, infop->mObjectName)) 5126 if (gMuteListp &&
5127 (gMuteListp->isMuted(infop->mObjectID, infop->mObjectName) ||
5128 gMuteListp->isMuted(infop->mOwnerID))
5129 )
5130 { 5130 {
5131 llinfos<<"Ignoring load_url from muted object/owner."<<llendl;
5131 delete infop; 5132 delete infop;
5132 infop = NULL; 5133 infop = NULL;
5133 return; 5134 return;
diff --git a/linden/indra/newview/llwebbrowserctrl.cpp b/linden/indra/newview/llwebbrowserctrl.cpp
index afd27bf..e819f21 100644
--- a/linden/indra/newview/llwebbrowserctrl.cpp
+++ b/linden/indra/newview/llwebbrowserctrl.cpp
@@ -217,6 +217,21 @@ BOOL LLWebBrowserCtrl::handleMouseDown( S32 x, S32 y, MASK mask )
217 217
218//////////////////////////////////////////////////////////////////////////////// 218////////////////////////////////////////////////////////////////////////////////
219// 219//
220BOOL LLWebBrowserCtrl::handleDoubleClick( S32 x, S32 y, MASK mask )
221{
222 llinfos << "JAMESDEBUG handleDoubleClick web ctrl" << llendl;
223 convertInputCoords(x, y);
224 //LLMozLib::getInstance()->mouseLeftDoubleClick( mEmbeddedBrowserWindowId, x, y );
225
226 gViewerWindow->setMouseCapture( this );
227
228 setFocus( TRUE );
229
230 return TRUE;
231}
232
233////////////////////////////////////////////////////////////////////////////////
234//
220void LLWebBrowserCtrl::onFocusReceived() 235void LLWebBrowserCtrl::onFocusReceived()
221{ 236{
222 LLMozLib::getInstance()->focusBrowser( mEmbeddedBrowserWindowId, true ); 237 LLMozLib::getInstance()->focusBrowser( mEmbeddedBrowserWindowId, true );
diff --git a/linden/indra/newview/llwebbrowserctrl.h b/linden/indra/newview/llwebbrowserctrl.h
index 8b19a23..dedb8cf 100644
--- a/linden/indra/newview/llwebbrowserctrl.h
+++ b/linden/indra/newview/llwebbrowserctrl.h
@@ -181,6 +181,7 @@ class LLWebBrowserCtrl :
181 virtual BOOL handleHover( S32 x, S32 y, MASK mask ); 181 virtual BOOL handleHover( S32 x, S32 y, MASK mask );
182 virtual BOOL handleMouseUp( S32 x, S32 y, MASK mask ); 182 virtual BOOL handleMouseUp( S32 x, S32 y, MASK mask );
183 virtual BOOL handleMouseDown( S32 x, S32 y, MASK mask ); 183 virtual BOOL handleMouseDown( S32 x, S32 y, MASK mask );
184 virtual BOOL handleDoubleClick( S32 x, S32 y, MASK mask );
184 virtual BOOL handleScrollWheel( S32 x, S32 y, S32 clicks ); 185 virtual BOOL handleScrollWheel( S32 x, S32 y, S32 clicks );
185 186
186 // navigation 187 // navigation
diff --git a/linden/indra/newview/macview.xcodeproj/project.pbxproj b/linden/indra/newview/macview.xcodeproj/project.pbxproj
index 2d54757..3e03152 100644
--- a/linden/indra/newview/macview.xcodeproj/project.pbxproj
+++ b/linden/indra/newview/macview.xcodeproj/project.pbxproj
@@ -5289,6 +5289,19 @@
5289 "$(SRCROOT)/../../libraries/universal-darwin/lib_release", 5289 "$(SRCROOT)/../../libraries/universal-darwin/lib_release",
5290 "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", 5290 "$(LIBRARY_SEARCH_PATHS_QUOTED_1)",
5291 ); 5291 );
5292 OTHER_CFLAGS = (
5293 "-DLL_DARWIN=1",
5294 "-DLL_RELEASE=1",
5295 "-DLL_RELEASE_FOR_DOWNLOAD=1",
5296 "-DLL_SEND_CRASH_REPORTS=1",
5297 "-DNDEBUG",
5298 "-fconstant-cfstrings",
5299 );
5300 OTHER_CPLUSPLUSFLAGS = (
5301 "$(OTHER_CFLAGS)",
5302 "-ffor-scope",
5303 "-Wno-reorder",
5304 );
5292 OTHER_LDFLAGS = "-Wl,-search_paths_first"; 5305 OTHER_LDFLAGS = "-Wl,-search_paths_first";
5293 PRODUCT_NAME = "Second Life"; 5306 PRODUCT_NAME = "Second Life";
5294 SEPARATE_STRIP = YES; 5307 SEPARATE_STRIP = YES;
@@ -5557,6 +5570,14 @@
5557 ); 5570 );
5558 LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/vivox-runtime/universal-darwin\""; 5571 LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/vivox-runtime/universal-darwin\"";
5559 LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/build/Universal\""; 5572 LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/build/Universal\"";
5573 OTHER_CFLAGS = (
5574 "-DLL_DARWIN=1",
5575 "-DLL_RELEASE=1",
5576 "-DLL_RELEASE_FOR_DOWNLOAD=1",
5577 "-DLL_SEND_CRASH_REPORTS=1",
5578 "-DNDEBUG",
5579 "-fconstant-cfstrings",
5580 );
5560 OTHER_LDFLAGS = ( 5581 OTHER_LDFLAGS = (
5561 "-lllmozlib", 5582 "-lllmozlib",
5562 "-Wl,-search_paths_first", 5583 "-Wl,-search_paths_first",
diff --git a/linden/indra/newview/newview.vcproj b/linden/indra/newview/newview.vcproj
index 941c6c0..a2cb32d 100644
--- a/linden/indra/newview/newview.vcproj
+++ b/linden/indra/newview/newview.vcproj
@@ -81,6 +81,7 @@
81 CharacterSet="1"> 81 CharacterSet="1">
82 <Tool 82 <Tool
83 Name="VCCLCompilerTool" 83 Name="VCCLCompilerTool"
84 AdditionalOptions="/Oy-"
84 GlobalOptimizations="FALSE" 85 GlobalOptimizations="FALSE"
85 InlineFunctionExpansion="2" 86 InlineFunctionExpansion="2"
86 EnableIntrinsicFunctions="TRUE" 87 EnableIntrinsicFunctions="TRUE"
@@ -149,8 +150,9 @@
149 CharacterSet="1"> 150 CharacterSet="1">
150 <Tool 151 <Tool
151 Name="VCCLCompilerTool" 152 Name="VCCLCompilerTool"
153 AdditionalOptions="/Oy-"
152 AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llaudio;..\llmedia;..\llimage;..\llscene;..\llxml;..\llmessage;..\llprimitive;..\llrender;..\llwindow;..\llcharacter;..\llinventory;..\llui;..\lscript;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include;..\..\libraries\include\zlib;&quot;..\..\libraries\i686-win32\include\quicktime&quot;;..\..\libraries\include\Logitech_LCD;..\..\libraries\include\Logitech_LCD\LCDUI" 154 AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llaudio;..\llmedia;..\llimage;..\llscene;..\llxml;..\llmessage;..\llprimitive;..\llrender;..\llwindow;..\llcharacter;..\llinventory;..\llui;..\lscript;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include;..\..\libraries\include\zlib;&quot;..\..\libraries\i686-win32\include\quicktime&quot;;..\..\libraries\include\Logitech_LCD;..\..\libraries\include\Logitech_LCD\LCDUI"
153 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;LL_WINDOWS;LL_RELEASE;LL_RELEASE_FOR_DOWNLOAD;XP_WIN;XP_WIN32;MOZILLA_INTERNAL_API" 155 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;LL_WINDOWS;LL_RELEASE;LL_RELEASE_FOR_DOWNLOAD;LL_SEND_CRASH_REPORTS=1;XP_WIN;XP_WIN32;MOZILLA_INTERNAL_API"
154 RuntimeLibrary="0" 156 RuntimeLibrary="0"
155 StructMemberAlignment="0" 157 StructMemberAlignment="0"
156 UsePrecompiledHeader="3" 158 UsePrecompiledHeader="3"
@@ -215,6 +217,7 @@
215 CharacterSet="1"> 217 CharacterSet="1">
216 <Tool 218 <Tool
217 Name="VCCLCompilerTool" 219 Name="VCCLCompilerTool"
220 AdditionalOptions="/Oy-"
218 Optimization="0" 221 Optimization="0"
219 AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llaudio;..\llmedia;..\llimage;..\llscene;..\llxml;..\llmessage;..\llprimitive;..\llrender;..\llwindow;..\llcharacter;..\llinventory;..\llui;..\lscript;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include;..\..\libraries\include\zlib;&quot;..\..\libraries\i686-win32\include\quicktime&quot;;..\..\libraries\include\Logitech_LCD;..\..\libraries\include\Logitech_LCD\LCDUI" 222 AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llaudio;..\llmedia;..\llimage;..\llscene;..\llxml;..\llmessage;..\llprimitive;..\llrender;..\llwindow;..\llcharacter;..\llinventory;..\llui;..\lscript;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include;..\..\libraries\include\zlib;&quot;..\..\libraries\i686-win32\include\quicktime&quot;;..\..\libraries\include\Logitech_LCD;..\..\libraries\include\Logitech_LCD\LCDUI"
220 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;LL_WINDOWS;LL_RELEASE;XP_WIN;XP_WIN32;MOZILLA_INTERNAL_API" 223 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;LL_WINDOWS;LL_RELEASE;XP_WIN;XP_WIN32;MOZILLA_INTERNAL_API"
diff --git a/linden/indra/newview/newview_vc8.vcproj b/linden/indra/newview/newview_vc8.vcproj
index 362462f..1a12404 100644
--- a/linden/indra/newview/newview_vc8.vcproj
+++ b/linden/indra/newview/newview_vc8.vcproj
@@ -137,6 +137,7 @@
137 /> 137 />
138 <Tool 138 <Tool
139 Name="VCCLCompilerTool" 139 Name="VCCLCompilerTool"
140 AdditionalOptions="/Oy-"
140 InlineFunctionExpansion="2" 141 InlineFunctionExpansion="2"
141 EnableIntrinsicFunctions="true" 142 EnableIntrinsicFunctions="true"
142 AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llaudio;..\llmedia;..\llimage;..\llscene;..\llxml;..\llmessage;..\llprimitive;..\llrender;..\llwindow;..\llcharacter;..\llinventory;..\llui;..\lscript;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\;&quot;..\..\libraries\i686-win32\include\quicktime&quot;;..\..\libraries\include\Logitech_LCD;..\..\libraries\include\Logitech_LCD\LCDUI" 143 AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llaudio;..\llmedia;..\llimage;..\llscene;..\llxml;..\llmessage;..\llprimitive;..\llrender;..\llwindow;..\llcharacter;..\llinventory;..\llui;..\lscript;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\;&quot;..\..\libraries\i686-win32\include\quicktime&quot;;..\..\libraries\include\Logitech_LCD;..\..\libraries\include\Logitech_LCD\LCDUI"
@@ -235,6 +236,7 @@
235 /> 236 />
236 <Tool 237 <Tool
237 Name="VCCLCompilerTool" 238 Name="VCCLCompilerTool"
239 AdditionalOptions="/Oy-"
238 AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llaudio;..\llmedia;..\llimage;..\llscene;..\llxml;..\llmessage;..\llprimitive;..\llrender;..\llwindow;..\llcharacter;..\llinventory;..\llui;..\lscript;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\;&quot;..\..\libraries\i686-win32\include\quicktime&quot;;..\..\libraries\include\Logitech_LCD;..\..\libraries\include\Logitech_LCD\LCDUI" 240 AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llaudio;..\llmedia;..\llimage;..\llscene;..\llxml;..\llmessage;..\llprimitive;..\llrender;..\llwindow;..\llcharacter;..\llinventory;..\llui;..\lscript;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\;&quot;..\..\libraries\i686-win32\include\quicktime&quot;;..\..\libraries\include\Logitech_LCD;..\..\libraries\include\Logitech_LCD\LCDUI"
239 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE;LL_RELEASE_FOR_DOWNLOAD;XP_WIN;XP_WIN32;MOZILLA_INTERNAL_API" 241 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE;LL_RELEASE_FOR_DOWNLOAD;XP_WIN;XP_WIN32;MOZILLA_INTERNAL_API"
240 RuntimeLibrary="0" 242 RuntimeLibrary="0"
@@ -259,7 +261,7 @@
259 <Tool 261 <Tool
260 Name="VCLinkerTool" 262 Name="VCLinkerTool"
261 LinkLibraryDependencies="false" 263 LinkLibraryDependencies="false"
262 AdditionalDependencies="advapi32.lib apr-1.lib aprutil-1.lib areslib.lib comdlg32.lib dinput8.lib dsound.lib dxerr8.lib dxguid.lib fmodvc.lib freetype.lib gdi32.lib glu32.lib jpeglib_6b.lib kernel32.lib libboost_regex-vc80-mt-s.lib libcurl.lib libeay32.lib libexpatMT.lib OpenJPEG.lib llaudio.lib llmedia.lib llcharacter.lib llcommon.lib llimage.lib llimagej2coj.lib llinventory.lib llmath.lib llmessage.lib llmozlib-vc80.lib llprimitive.lib llrender.lib llui.lib llvfs.lib llwindow.lib llxml.lib lscript_compile.lib lscript_library.lib mswsock.lib netapi32.lib odbc32.lib odbccp32.lib ogg_static_mt.lib ole32.lib oleaut32.lib opengl32.lib png12.lib psapi.lib qtmlclient.lib shell32.lib ssleay32.lib user32.lib Vfw32.lib vorbis_static_mt.lib vorbisenc_static_mt.lib vorbisfile_static_mt.lib winmm.lib winspool.lib ws2_32.lib xmlrpcepi.lib zlib.lib dnsapi.lib EZ_LCD_Wrapper_vc8.lib lgLcd.lib" 264 AdditionalDependencies="advapi32.lib apr-1.lib aprutil-1.lib areslib.lib comdlg32.lib dinput8.lib dsound.lib dxerr.lib dxguid.lib fmodvc.lib freetype.lib gdi32.lib glu32.lib jpeglib_6b.lib kernel32.lib libboost_regex-vc80-mt-s.lib libcurl.lib libeay32.lib libexpatMT.lib OpenJPEG.lib llaudio.lib llmedia.lib llcharacter.lib llcommon.lib llimage.lib llimagej2coj.lib llinventory.lib llmath.lib llmessage.lib llmozlib-vc80.lib llprimitive.lib llrender.lib llui.lib llvfs.lib llwindow.lib llxml.lib lscript_compile.lib lscript_library.lib mswsock.lib netapi32.lib odbc32.lib odbccp32.lib ogg_static_mt.lib ole32.lib oleaut32.lib opengl32.lib png12.lib psapi.lib qtmlclient.lib shell32.lib ssleay32.lib user32.lib Vfw32.lib vorbis_static_mt.lib vorbisenc_static_mt.lib vorbisfile_static_mt.lib winmm.lib winspool.lib ws2_32.lib xmlrpcepi.lib zlib.lib dnsapi.lib EZ_LCD_Wrapper_vc8.lib lgLcd.lib"
263 OutputFile="$(ConfigurationName)/SecondLife.exe" 265 OutputFile="$(ConfigurationName)/SecondLife.exe"
264 LinkIncremental="0" 266 LinkIncremental="0"
265 AdditionalLibraryDirectories="&quot;../lib_release/i686-win32&quot;;&quot;../../libraries/i686-win32/lib_release&quot;" 267 AdditionalLibraryDirectories="&quot;../lib_release/i686-win32&quot;;&quot;../../libraries/i686-win32/lib_release&quot;"
@@ -325,6 +327,7 @@
325 /> 327 />
326 <Tool 328 <Tool
327 Name="VCCLCompilerTool" 329 Name="VCCLCompilerTool"
330 AdditionalOptions="/Oy-"
328 Optimization="0" 331 Optimization="0"
329 AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llaudio;..\llmedia;..\llimage;..\llscene;..\llxml;..\llmessage;..\llprimitive;..\llrender;..\llwindow;..\llcharacter;..\llinventory;..\llui;..\lscript;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\;&quot;..\..\libraries\i686-win32\include\quicktime&quot;;..\..\libraries\include\Logitech_LCD;..\..\libraries\include\Logitech_LCD\LCDUI" 332 AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llaudio;..\llmedia;..\llimage;..\llscene;..\llxml;..\llmessage;..\llprimitive;..\llrender;..\llwindow;..\llcharacter;..\llinventory;..\llui;..\lscript;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\;&quot;..\..\libraries\i686-win32\include\quicktime&quot;;..\..\libraries\include\Logitech_LCD;..\..\libraries\include\Logitech_LCD\LCDUI"
330 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE;XP_WIN;XP_WIN32;MOZILLA_INTERNAL_API" 333 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE;XP_WIN;XP_WIN32;MOZILLA_INTERNAL_API"
diff --git a/linden/indra/newview/releasenotes.txt b/linden/indra/newview/releasenotes.txt
index 6c581c5..a217a6b 100644
--- a/linden/indra/newview/releasenotes.txt
+++ b/linden/indra/newview/releasenotes.txt
@@ -1,3 +1,17 @@
1Release Notes for Second Life 1.18.6(1) December 12, 2007
2=====================================
3Changes:
4* Change crash logger "Remember this choice" function to default to on
5* Connect button now has focus on login screen
6* Inventory folder loading state now more clearly indicated
7
8Fixes:
9* VWR-3558: llLoadURL cannot be muted
10* VWR-3428: Checking a users profile while editing a linked set causes viewer crash
11* Viewer channel and version numbers reported incorrectly during login
12* Inventory cache version number incorrectly incremented, leading to perceved loss
13* Age verification status hard to read in the profile field
14
1Release Notes for Second Life 1.18.6(0) December 5, 2007 15Release Notes for Second Life 1.18.6(0) December 5, 2007
2===================================== 16=====================================
3Changes: 17Changes:
diff --git a/linden/indra/newview/res/newViewRes.rc b/linden/indra/newview/res/newViewRes.rc
index 05081a9..f1836d6 100644
--- a/linden/indra/newview/res/newViewRes.rc
+++ b/linden/indra/newview/res/newViewRes.rc
@@ -228,8 +228,8 @@ TOOLPIPETTE CURSOR "toolpipette.cur"
228// 228//
229 229
230VS_VERSION_INFO VERSIONINFO 230VS_VERSION_INFO VERSIONINFO
231 FILEVERSION 1,18,6,0 231 FILEVERSION 1,18,6,1
232 PRODUCTVERSION 1,18,6,0 232 PRODUCTVERSION 1,18,6,1
233 FILEFLAGSMASK 0x3fL 233 FILEFLAGSMASK 0x3fL
234#ifdef _DEBUG 234#ifdef _DEBUG
235 FILEFLAGS 0x1L 235 FILEFLAGS 0x1L
@@ -246,12 +246,12 @@ BEGIN
246 BEGIN 246 BEGIN
247 VALUE "CompanyName", "Linden Lab" 247 VALUE "CompanyName", "Linden Lab"
248 VALUE "FileDescription", "Second Life" 248 VALUE "FileDescription", "Second Life"
249 VALUE "FileVersion", "1.18.6.0" 249 VALUE "FileVersion", "1.18.6.1"
250 VALUE "InternalName", "Second Life" 250 VALUE "InternalName", "Second Life"
251 VALUE "LegalCopyright", "Copyright © 2001-2007, Linden Research, Inc." 251 VALUE "LegalCopyright", "Copyright © 2001-2007, Linden Research, Inc."
252 VALUE "OriginalFilename", "SecondLife.exe" 252 VALUE "OriginalFilename", "SecondLife.exe"
253 VALUE "ProductName", "Second Life" 253 VALUE "ProductName", "Second Life"
254 VALUE "ProductVersion", "1.18.6.0" 254 VALUE "ProductVersion", "1.18.6.1"
255 END 255 END
256 END 256 END
257 BLOCK "VarFileInfo" 257 BLOCK "VarFileInfo"
diff --git a/linden/indra/newview/skins/xui/en-us/menu_login.xml b/linden/indra/newview/skins/xui/en-us/menu_login.xml
index 6533f90..02addf3 100644
--- a/linden/indra/newview/skins/xui/en-us/menu_login.xml
+++ b/linden/indra/newview/skins/xui/en-us/menu_login.xml
@@ -5,7 +5,7 @@
5 width="802"> 5 width="802">
6 <menu bottom="273" drop_shadow="true" enabled="true" height="263" 6 <menu bottom="273" drop_shadow="true" enabled="true" height="263"
7 hidden="false" label="File" left="0" mouse_opaque="false" name="File" 7 hidden="false" label="File" left="0" mouse_opaque="false" name="File"
8 opaque="true" tear_off="true" create_jump_keys="true" width="243"> 8 opaque="true" tear_off="false" create_jump_keys="true" width="243">
9 <menu_item_call bottom="-29" enabled="true" height="19" hidden="false" label="Quit" left="0" 9 <menu_item_call bottom="-29" enabled="true" height="19" hidden="false" label="Quit" left="0"
10 mouse_opaque="true" name="Quit" shortcut="control|Q" width="243"> 10 mouse_opaque="true" name="Quit" shortcut="control|Q" width="243">
11 <on_click function="File.Quit" userdata="" /> 11 <on_click function="File.Quit" userdata="" />
@@ -13,7 +13,7 @@
13 </menu> 13 </menu>
14 <menu bottom="97" drop_shadow="true" enabled="true" height="439" 14 <menu bottom="97" drop_shadow="true" enabled="true" height="439"
15 hidden="false" label="Edit" left="38" mouse_opaque="false" name="Edit" 15 hidden="false" label="Edit" left="38" mouse_opaque="false" name="Edit"
16 opaque="true" tear_off="true" create_jump_keys="true" width="153"> 16 opaque="true" tear_off="false" create_jump_keys="true" width="153">
17 <menu_item_call bottom="-29" enabled="true" height="19" hidden="false" label="Preferences..." 17 <menu_item_call bottom="-29" enabled="true" height="19" hidden="false" label="Preferences..."
18 left="0" mouse_opaque="true" name="Preferences..." shortcut="control|P" 18 left="0" mouse_opaque="true" name="Preferences..." shortcut="control|P"
19 width="153"> 19 width="153">
@@ -22,7 +22,7 @@
22 </menu> 22 </menu>
23 <menu bottom="219" drop_shadow="true" enabled="true" height="317" 23 <menu bottom="219" drop_shadow="true" enabled="true" height="317"
24 hidden="false" label="Help" left="80" mouse_opaque="false" name="Help" 24 hidden="false" label="Help" left="80" mouse_opaque="false" name="Help"
25 opaque="true" tear_off="true" create_jump_keys="true" width="166"> 25 opaque="true" tear_off="falsoe" create_jump_keys="true" width="166">
26 <menu_item_call bottom="-29" enabled="true" height="19" hidden="false" label="Second Life Help" 26 <menu_item_call bottom="-29" enabled="true" height="19" hidden="false" label="Second Life Help"
27 left="0" mouse_opaque="true" name="Second Life Help" shortcut="F1" 27 left="0" mouse_opaque="true" name="Second Life Help" shortcut="F1"
28 width="166"> 28 width="166">
diff --git a/linden/indra/newview/skins/xui/en-us/panel_avatar.xml b/linden/indra/newview/skins/xui/en-us/panel_avatar.xml
index c5c42b4..a51b8e7 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_avatar.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_avatar.xml
@@ -6,6 +6,7 @@
6 <text hidden="true" name="CaptionTextAcctInfo"> 6 <text hidden="true" name="CaptionTextAcctInfo">
7 [ACCTTYPE] 7 [ACCTTYPE]
8[PAYMENTINFO] 8[PAYMENTINFO]
9[AGEVERIFICATION]
9 </text> 10 </text>
10 <text hidden="true" name="AcctTypeResident"> 11 <text hidden="true" name="AcctTypeResident">
11 Resident 12 Resident
@@ -29,10 +30,10 @@
29 No Payment Info On File 30 No Payment Info On File
30 </text> 31 </text>
31 <text hidden="true" name="AgeVerified"> 32 <text hidden="true" name="AgeVerified">
32 , Age-verified 33 Age-verified
33 </text> 34 </text>
34 <text hidden="true" name="NotAgeVerified"> 35 <text hidden="true" name="NotAgeVerified">
35 , Not Age-verified 36 Not Age-verified
36 </text> 37 </text>
37 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 38 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
38 bottom="-24" drop_shadow_visible="true" follows="left|top" 39 bottom="-24" drop_shadow_visible="true" follows="left|top"
@@ -68,12 +69,13 @@
68 mouse_opaque="true" name="label2" v_pad="0" width="121"> 69 mouse_opaque="true" name="label2" v_pad="0" width="121">
69 Account: 70 Account:
70 </text> 71 </text>
71 <view_border bevel_style="in" bottom_delta="-32" follows="left|top" height="32" left="279" 72 <view_border bevel_style="in" bottom_delta="-48" follows="left|top" height="48" left="279"
72 mouse_opaque="false" name="acct_border" width="121" /> 73 mouse_opaque="false" name="acct_border" width="121" />
73 <text bg_color="0, 0, 0, 0" bg_visible="false" border_drop_shadow_visible="false" 74 <text bg_color="0, 0, 0, 0" bg_visible="false" border_drop_shadow_visible="false"
74 border_visible="true" bottom_delta="0" drop_shadow_visible="true" 75 border_visible="true" bottom_delta="0" drop_shadow_visible="true"
75 follows="left|top" font="SansSerifSmall" height="32" left="279" 76 follows="left|top" font="SansSerifSmall" height="48" left="279"
76 mouse_opaque="false" name="acct" text_color="1, 1, 1, 1" width="121" /> 77 mouse_opaque="false" name="acct" text_color="1, 1, 1, 1" width="121" />
78
77 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 79 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
78 bottom_delta="-20" drop_shadow_visible="true" follows="left|top" 80 bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
79 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="279" 81 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="279"