From a41ce2d28105dd1b2bd4fc4a43f00e6a8cfc6a51 Mon Sep 17 00:00:00 2001 From: Lirusaito Date: Sun, 12 Jun 2016 15:52:20 -0400 Subject: [PATCH 1/6] When LLTextEditor calls onCommit, update its setting value if applicable. Hook up commit on focus lost, too, have the autoresponse messages do that. --- indra/llui/lltexteditor.cpp | 5 +++++ .../default/xui/en-us/panel_preferences_ascent_chat.xml | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp index 57ef25acc..208cb1ed4 100644 --- a/indra/llui/lltexteditor.cpp +++ b/indra/llui/lltexteditor.cpp @@ -362,6 +362,7 @@ LLTextEditor::LLTextEditor( menu->setCanTearOff(FALSE); menu->setVisible(FALSE); mPopupMenuHandle = menu->getHandle(); + setCommitCallback(boost::bind(&LLTextEditor::setControlValue, this, _2)); } @@ -4820,6 +4821,10 @@ LLView* LLTextEditor::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory node->getAttributeBOOL("hide_scrollbar",hide_scrollbar); text_editor->setHideScrollbarForShortDocs(hide_scrollbar); + BOOL commit_on_focus_lost = FALSE; + node->getAttributeBOOL("commit_on_focus_lost",commit_on_focus_lost); + text_editor->setCommitOnFocusLost(commit_on_focus_lost); + text_editor->initFromXML(node, parent); return text_editor; diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml index e0d0867d2..3c64e70e2 100644 --- a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml +++ b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml @@ -121,27 +121,27 @@ The following wildcards are available to enhance your autoresponses: #n for user - + - + - + - + From 563f252dc168b57d980736d7960098869e590ce7 Mon Sep 17 00:00:00 2001 From: Lirusaito Date: Sat, 11 Jun 2016 21:06:25 -0400 Subject: [PATCH 2/6] Set AgentAppearanceServiceURL properly on login (fixes misplaced }) --- indra/newview/llstartup.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index b4a50373a..4a6463bfd 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -4174,13 +4174,14 @@ bool process_login_success_response(std::string& password, U32& first_sim_size_x gCloudTextureID = id; } #endif - // set the location of the Agent Appearance service, from which we can request - // avatar baked textures if they are supported by the current region - std::string agent_appearance_url = response["agent_appearance_service"]; - if (!agent_appearance_url.empty()) - { - gSavedSettings.setString("AgentAppearanceServiceURL", agent_appearance_url); - } + } + + // set the location of the Agent Appearance service, from which we can request + // avatar baked textures if they are supported by the current region + std::string agent_appearance_url = response["agent_appearance_service"]; + if (!agent_appearance_url.empty()) + { + gSavedSettings.setString("AgentAppearanceServiceURL", agent_appearance_url); } // Override grid info with anything sent in the login response From 8c86c1cd0fb43ec555ffa9911d915b7c7cfef9fa Mon Sep 17 00:00:00 2001 From: Lirusaito Date: Sat, 11 Jun 2016 07:52:00 -0400 Subject: [PATCH 3/6] Fix a buncha texture missing warnings. --- .../skins/default/textures/textures.xml | 41 ------------------ .../default/textures/world/BeaconArrow.png | Bin 0 -> 994 bytes .../default/textures/world/CameraDragDot.png | Bin 0 -> 563 bytes .../default/textures/world/NoEntryLines.png | Bin 0 -> 1265 bytes .../textures/world/NoEntryPassLines.png | Bin 0 -> 1267 bytes 5 files changed, 41 deletions(-) create mode 100644 indra/newview/skins/default/textures/world/BeaconArrow.png create mode 100644 indra/newview/skins/default/textures/world/CameraDragDot.png create mode 100644 indra/newview/skins/default/textures/world/NoEntryLines.png create mode 100644 indra/newview/skins/default/textures/world/NoEntryPassLines.png diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 5917069bc..ddaf14ca9 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -358,7 +358,6 @@ with the same filename but different name - @@ -401,44 +400,4 @@ with the same filename but different name - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/indra/newview/skins/default/textures/world/BeaconArrow.png b/indra/newview/skins/default/textures/world/BeaconArrow.png new file mode 100644 index 0000000000000000000000000000000000000000..54934f738a90bb8615af7108b062a3c8ac39278a GIT binary patch literal 994 zcmV<810DQ{P)+d(4U5p1%{5{SA|i$ldzd|B<%18g7cpTt>5tJ^E|3CO5Xr*K zBq|!g$jZdrz1_QWBOx}MR@bZ71Mj&3x$NP$f% zl~QO{(v4=pgmPW_N z$4FmaUmV7dkXT+8W#w^OG>3+UB#<>bp(OL?nl+1F7-g`>U7*?A+*~ITiFR=ue^3&_ zu4YY0D&nfDDnG=bwPb`{MYE=+rV}>wZ>_DZl_eo8jb?9euehgt-Kwy=^AmPXTPG@|9@<#p}t z?e8dE{8A9+bUI0o$3q4J0YfwzrTQ?E)xxO!V6|GYrKP1`Q&Usjr>Cc0^0G~5tuU(8 z>hJGA+uGV%@p`?_K~FSObmY-nh3z!dM@#uuY81}m1zc8|?w!~K4LY<70`^~uSJ3nq!( z<&=sM<8rxJHuS>b@H&MagvBx)$8U@nhr`MEG7jPh85kHq_V@SQuv)KSl@9LetKjLL zF7%2<7=@nMY(85DqXWI75C(-SRlpK^dwU*OtygrQ_Yd|=zN$r0G*Vkzdw*eJ;b?Ml z@(rNp1W~{9;fv7~0}-1(pD*lkx!&S99?YjNMum-!k3YSvc9Qw_^+$jK0Fm((G$pTT Q!2kdN07*qoM6N<$g4nm>x&QzG literal 0 HcmV?d00001 diff --git a/indra/newview/skins/default/textures/world/CameraDragDot.png b/indra/newview/skins/default/textures/world/CameraDragDot.png new file mode 100644 index 0000000000000000000000000000000000000000..2ccf098e0ff73e8f00dbb43188fd070f909515d0 GIT binary patch literal 563 zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh0wlLOK8*rWEa{HEjtmSN`)Ym%P6qN7l0AZa z85r9685nwi_%BdXqXPp&Z6yQ4%Weh+o2Lv6l4pu-TFZfInUcKST^Rni_n+Ah4nJa0`Jj%IE{-7*mun|%^g0|M;dXwnx#o(g zC7Em+7Y96KUnsIpS^g9Q$I^ z?&mr8x68UVYKU+Z>^M=IzsiEg&W>%vlP5P$G%^ML$k|wY(az%1v!9s;iiwVLmM)$8 zTNBmgb~jbnyz%g@3GA4dwSK0L@pi+R-)04gCOh@tUF}$~DNWfi`}ebXOOFL`?$S(c z))Vb%KXjwYOEUcU0vnlc#qZuuJ%3fE`*Osln;D)rZ+7rxJF)6t{P@x;;$!l!vP!xA zlV=OW%t-$dsxBX=@INP;wey^zlFep?@ zTq8 znqpspY>))m5S*V@Ql40p$`Fv4nOCCc=Nh6=W~^tbXJKyL5DQeq;OXk;vd$@?2>`Yr B%54Au literal 0 HcmV?d00001 diff --git a/indra/newview/skins/default/textures/world/NoEntryLines.png b/indra/newview/skins/default/textures/world/NoEntryLines.png new file mode 100644 index 0000000000000000000000000000000000000000..d7496b8bd000ba4e0d655460daf2c3b9f9fc31e6 GIT binary patch literal 1265 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K5893O0R7}x|G$5sr>=ES4z)+>iz|hdl!0_`w zkbcR)P-?)y@G60U!DwQNb=?k)`fL2$v|<&%LToCO|{#S9GG!XV7Z zFl&wkNU*HHF&$05*T?`D&?>t=`Ln>~)z2oh5#DT%};th?aY{5GX)#cn==kByC z@ICVQm|x%I`)c0ih5-FW@7^M#^PgEva{Fo-9#pU}92!M53IRX)y!H9hs&4!|dbOmi zZs!lh`Saf`Uw(XdeXZfQ+wnK{-{4K?eLOv7|KIF8`#l)0S=DKNyS@L~Uv~C{vyZ1I z0EO?>2QXZ-`xgKd{`R+;J)z}e`-c1f1i!r(Z3sN}{&d}M_nZ5R8Qi4y^Z$M;pZVX9 zQ6l%xx;NYFxBQJ}PdM^%H%RgKe4ygv`5?u2|EDv!$?fL_Dz5y$o>8LqPdrfZm%sLG z3k?35gPim~mqF`sebWBFQ~$;@1xWpu{ry(|?SFxWTR+af*}i|-L1;Fyx1 zl&avFo0y&&l$w}QS$HzlhJk@)s;7%%NX4x;ckDB!l*=6dm_Kh`gx4kR(wCC9+7SV# zL~n^`nR2ZxG2m_L+r^>OvBN^cc9+;JzNNBVtXugG9X)vVMF59Ign%YXl9HrKvu1`i z%Otf&_wQW3!`tMNarxeb>Ur0>ja15?y!-s;fp3xcrHRWj8GcUL!J@#>z`(%7z`;N* z2K7vWyNK3CI*5su&3V1=+N%7pS6at!&wV=0{^Wh}^hf^=o%#PS=~jOI?zjFj`~H4= zUS9v`!`tol`+p0!=kNdf^X~kV%0HJLo6I|RwYd7nx7+{Ae@`xxjjx||Y_a{Tk2Qv| zh0(kA{5+Xsd#^g#UFO|dv-j6`)KBBPU-vtDNiqChKT?qArs?S{rr$fsQ&;+Hzumsy^|w`L--C@0*ZOY!P+^zn-+w&F zUn)J1$7Saizr45)8}I+C-?e|j){nf?m(}&Gw_km}5m?&mJDxgO}N z{j>ghUOQ&q)7O7wANSN9R-xTT(?1t(*)Mhfo&33@4{zuH&-x~QtG1?AGp=fNvTwSO z`?m1M*I&LiEXuC<`SZWf`*o|2H1_wWegX#F|NU?Dw^aYEGXLWGYtOGopXb+0_pP;k ze>~x7LX6yM*Oj|vqP?fqf35g-d;ZtIvh(NY#$_M>C_m-bqxSRb*ZlbPadq?A<3Eb7 zzkF6JCDk7;Yb#NnrfyUWbR^KL>vYy??+}%X+Go4{Q9_W>p2?szuk8K z-=8-);?Sbz_uKRD|Mi*pGM`ZYFDk*pAi&@N%EQ!RFcxr9)jW{9sO&@xBO82vc{eaJ Zq@R0qK+^hP3a}Jo@O1TaS?83{1OQ@TsE7an literal 0 HcmV?d00001 From bc93f2792dc03559c4935588987c104e4f525920 Mon Sep 17 00:00:00 2001 From: Lirusaito Date: Tue, 14 Jun 2016 04:05:38 -0400 Subject: [PATCH 4/6] Enable Crashing On Crashes --- indra/llcommon/llapp.cpp | 33 +++++++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/indra/llcommon/llapp.cpp b/indra/llcommon/llapp.cpp index bc3e7196d..69f26a253 100644 --- a/indra/llcommon/llapp.cpp +++ b/indra/llcommon/llapp.cpp @@ -311,18 +311,43 @@ LLSD LLApp::getOptionData(OptionPriority level) return mOptions[level]; } +#if LL_WINDOWS +//The following code is needed for 32-bit apps on 64-bit windows to keep it from eating +//crashes. It is a lovely undocumented 'feature' in SP1 of Windows 7. An excellent +//in-depth article on the issue may be found here: http://randomascii.wordpress.com/2012/07/05/when-even-crashing-doesn-work/ +void EnableCrashingOnCrashes() +{ + typedef BOOL (WINAPI *tGetPolicy)(LPDWORD lpFlags); + typedef BOOL (WINAPI *tSetPolicy)(DWORD dwFlags); + const DWORD EXCEPTION_SWALLOWING = 0x1; + + HMODULE kernel32 = LoadLibraryA("kernel32.dll"); + tGetPolicy pGetPolicy = (tGetPolicy)GetProcAddress(kernel32, + "GetProcessUserModeExceptionPolicy"); + tSetPolicy pSetPolicy = (tSetPolicy)GetProcAddress(kernel32, + "SetProcessUserModeExceptionPolicy"); + if (pGetPolicy && pSetPolicy) + { + DWORD dwFlags; + if (pGetPolicy(&dwFlags)) + { + // Turn off the filter + pSetPolicy(dwFlags & ~EXCEPTION_SWALLOWING); + } + } +} +#endif + void LLApp::setupErrorHandling() { // Error handling is done by starting up an error handling thread, which just sleeps and // occasionally checks to see if the app is in an error state, and sees if it needs to be run. #if LL_WINDOWS - // Windows doesn't have the same signal handling mechanisms as UNIX, thus APR doesn't provide - // a signal handling thread implementation. - // What we do is install an unhandled exception handler, which will try to do the right thing - // in the case of an error (generate a minidump) #if LL_SEND_CRASH_REPORTS + EnableCrashingOnCrashes(); + // This sets a callback to handle w32 signals to the console window. // The viewer shouldn't be affected, sicne its a windowed app. SetConsoleCtrlHandler( (PHANDLER_ROUTINE) ConsoleCtrlHandler, TRUE); From 5c786e40ed5c8e04e7b4140bf7c6776b1856574c Mon Sep 17 00:00:00 2001 From: Lirusaito Date: Tue, 14 Jun 2016 04:11:26 -0400 Subject: [PATCH 5/6] Update mIsHD3K patch to Drake's impl Hopefully that'll squish the bug once and for all. --- indra/llrender/llgl.cpp | 28 +++++++++++++--------------- indra/llrender/llgl.h | 1 + 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/indra/llrender/llgl.cpp b/indra/llrender/llgl.cpp index 5a0668ef3..012630f22 100644 --- a/indra/llrender/llgl.cpp +++ b/indra/llrender/llgl.cpp @@ -451,6 +451,7 @@ LLGLManager::LLGLManager() : mIsATI(FALSE), mIsNVIDIA(FALSE), mIsIntel(FALSE), + mIsHD3K(FALSE), mIsGF2or4MX(FALSE), mIsGF3(FALSE), mIsGFFX(FALSE), @@ -606,20 +607,18 @@ bool LLGLManager::initGL() LLImageGL::sCompressTextures = false; } -#if LL_WINDOWS - bool mIsHD3K(false); -#endif // Trailing space necessary to keep "nVidia Corpor_ati_on" cards // from being recognized as ATI. - if (mGLVendor.substr(0,4) == "ATI ") + if (mGLVendor.substr(0,4) == "ATI " +//#if LL_LINUX +// // The Mesa-based drivers put this in the Renderer string, +// // not the Vendor string. +// || mGLRenderer.find("AMD") != std::string::npos +//#endif //LL_LINUX + ) { mGLVendorShort = "ATI"; - // "mobile" appears to be unused, and this code was causing warnings. - //BOOL mobile = FALSE; - //if (mGLRenderer.find("MOBILITY") != std::string::npos) - //{ - // mobile = TRUE; - //} + // *TODO: Fix this? mIsATI = TRUE; #if LL_WINDOWS && !LL_MESA_HEADLESS @@ -734,12 +733,11 @@ bool LLGLManager::initGL() if (mHasVertexShader) { //According to the spec, the resulting value should never be less than 512. We need at least 1024 to use skinned shaders. -#if LL_WINDOWS - if (mIsHD3K) - mGLMaxVertexUniformComponents = 4096; - else -#endif glGetIntegerv(GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB, &mGLMaxVertexUniformComponents); + if (mIsHD3K) + { + mGLMaxVertexUniformComponents = llmax(mGLMaxVertexUniformComponents, 4096); + } } if (LLRender::sGLCoreProfile) diff --git a/indra/llrender/llgl.h b/indra/llrender/llgl.h index 36650b442..b3d7faa12 100644 --- a/indra/llrender/llgl.h +++ b/indra/llrender/llgl.h @@ -120,6 +120,7 @@ public: BOOL mIsATI; BOOL mIsNVIDIA; BOOL mIsIntel; + BOOL mIsHD3K; BOOL mIsGF2or4MX; BOOL mIsGF3; BOOL mIsGFFX; From 6df030d70604643a4d62bedef4a015ffa6604744 Mon Sep 17 00:00:00 2001 From: Lirusaito Date: Tue, 14 Jun 2016 04:39:08 -0400 Subject: [PATCH 6/6] Update the links for Report Singularity Bug and Request New Feature --- indra/newview/skins/default/xui/en-us/menu_viewer.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/indra/newview/skins/default/xui/en-us/menu_viewer.xml index 88b9bc942..9d9f16814 100644 --- a/indra/newview/skins/default/xui/en-us/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en-us/menu_viewer.xml @@ -1038,10 +1038,10 @@ + userdata="WebLaunchSinguIssue,https://singularityviewer.atlassian.net/secure/CreateIssue!default.jspa?issuetype=1" /> - +