Permalink
Browse files

Merge branch 'Release' of https://github.com/Lirusaito/SingularityVie…

  • Loading branch information...
Shyotl committed Jun 15, 2016
2 parents 60e6f10 + 6df030d commit 5ccfc3257be330bc9e99b6daf1c995392f376ba9
View
@@ -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);
View
@@ -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)
View
@@ -120,6 +120,7 @@ class LLGLManager
BOOL mIsATI;
BOOL mIsNVIDIA;
BOOL mIsIntel;
BOOL mIsHD3K;
BOOL mIsGF2or4MX;
BOOL mIsGF3;
BOOL mIsGFFX;
@@ -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;
@@ -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
@@ -358,7 +358,6 @@ with the same filename but different name
<texture name="radio_inactive_true.tga" preload="true"/>
<texture name="resize_handle_bottom_right_blue.tga" preload="true"/>
<texture name="sm_rounded_corners_simple.tga" scale.left="4" scale.top="4" scale.bottom="4" scale.right="4"/>
<texture name="search_btn.png" preload="true"/>
<texture name="spin_down_in_blue.tga" preload="true"/>
<texture name="spin_down_out_blue.tga" preload="true"/>
<texture name="spin_up_in_blue.tga" preload="true"/>
@@ -401,44 +400,4 @@ with the same filename but different name
<texture name="icn_slide-thumb_dark.tga" scale.left="2" scale.top="5" scale.right="29" scale.bottom="4"/>
<texture name="map_avatar_you_8.tga"/>
<texture name="icon_avatar_expand.png" preload="true" />
<texture name="skin_thumbnail_darkorange.png" preload="true" />
<texture name="Fly_btn_stop.png" preload="true"/>
<texture name="Fly_btn_active.png" preload="true"/>
<texture name="Fly_btn_disabled.png" preload="true"/>
<texture name="communicate_btn_active.png" preload="true"/>
<texture name="communicate_btn_pressed.png" preload="true"/>
<texture name="mapbg3.tga" preload="true"/>
<texture name="inventory_btn.png" preload="true"/>
<texture name="create.png" preload="true"/>
<texture name="land_floatbg.tga" preload="true"/>
<texture name="panel_notes.png" preload="true"/>
<texture name="panel_mylatest.png" preload="true"/>
<texture name="panel_picks.png" preload="true"/>
<texture name="panel_web.png" preload="true"/>
<texture name="panel_avatarbio1.png" preload="true"/>
<texture name="panel_avatar.png" preload="true"/>
<texture name="purchaseimage_bg.tga" preload="true"/>
<texture name="skin_thumbnail_default.png" preload="true" />
<texture name="skin_thumbnail_silver.png" preload="true" />
<texture name="chat_btn_active.png" preload="true"/>
<texture name="chat_btn.png" preload="true"/>
<texture name="screenshot.png" preload="true"/>
<texture name="minimap.png" preload="true"/>
<texture name="worldmap.png" preload="true"/>
<texture name="tools_floatbg.png" preload="true"/>
<texture name="closebox.png" preload="true"/>
<texture name="OpenlifeBeta_logo" file_name="openlifegridbetalogo.png" preload="true" />
<texture name="3dxcreative32_logo" file_name="3dxcreative32.png" preload="true" />
<texture name="login_panel" file_name="loginpane.png" preload="true" />
<texture name="connect_btn" file_name="Connect120.png" preload="true" />
<texture name="skin_thumbnail_dark.png" preload="true" />
<texture name="skin_thumbnail_emerald.png" preload="true" />
<texture name="skin_thumbnail_gred.png" preload="true" />
<texture name="skin_thumbnail_ruby.png" preload="true" />
<texture name="skin_thumbnail_pslgreen.png" preload="true" />
<texture name="skin_thumbnail_pslpurple.png" preload="true" />
<texture name="skin_thumbnail_saphire.png" preload="true" />
<texture name="skin_thumbnail_sapphire.png" preload="true" />
<texture name="skin_thumbnail_white_emerald.png" preload="true" />
</textures>
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1038,10 +1038,10 @@
<menu_item_call bottom="-240" enabled="true" height="19" label="Report [SHORT_APP_NAME] Bug..." left="0"
mouse_opaque="true" name="Report [SHORT_APP_NAME] Bug..." width="166">
<on_click function="PromptShowURL" name="ReportSinguBug_url"
userdata="WebLaunchSinguIssue,http://code.google.com/p/singularity-viewer/issues/entry" />
userdata="WebLaunchSinguIssue,https://singularityviewer.atlassian.net/secure/CreateIssue!default.jspa?issuetype=1" />
</menu_item_call>
<menu_item_call bottom="-240" enabled="true" height="19" label="Request New Feature..." name="Request New Feature..." width="166">
<on_click function="PromptShowURL" name="RequestFeature_url" userdata="WebLaunchSinguIssue,http://code.google.com/p/singularity-viewer/issues/entry?template=Feature%20request"/>
<on_click function="PromptShowURL" name="RequestFeature_url" userdata="WebLaunchSinguIssue,https://singularityviewer.atlassian.net/secure/CreateIssue!default.jspa?issuetype=2"/>
</menu_item_call>
</menu>
<menu_item_call bottom="-313" enabled="true" height="19" label="About [SHORT_APP_NAME]..." left="0"
@@ -121,27 +121,27 @@ The following wildcards are available to enhance your autoresponses: #n for user
<check_box bottom_delta="0" left_delta="150" follows="left|top" control_name="AutoresponseAnyoneFriendsOnly" name="AutoresponseAnyoneFriendsOnly" label="for friends only" tool_tip="Avoids sending this response to those you don't know"/>
<check_box bottom_delta="0" left_delta="100" follows="left|top" control_name="AutoresponseAnyoneItem" name="AutoresponseAnyoneItem" label="Send item"/>
<check_box bottom_delta="0" left_delta="80" follows="left|top" control_name="AutoresponseAnyoneShow" name="AutoresponseAnyoneShow" label="Show that this was sent"/>
<text_editor bottom_delta="-147" left="8" font="SansSerifSmall" follows="left|top" height="145" max_length="1100" control_name="AutoresponseAnyoneMessage" name="AutoresponseAnyoneMessage" width="480" word_wrap="true" spell_check="true" hide_scrollbar="true"/>
<text_editor bottom_delta="-147" left="8" font="SansSerifSmall" follows="left|top" height="145" max_length="1100" control_name="AutoresponseAnyoneMessage" name="AutoresponseAnyoneMessage" width="480" word_wrap="true" spell_check="true" commit_on_focus_lost="true" hide_scrollbar="true"/>
<drop_target bottom_delta="-37" left="8" height="17" width="480" fill_parent="true" control_name="AutoresponseAnyoneItemID" name="AutoresponseAnyoneItemID" tool_tip="Drop an item here to have it sent with the above response."/>
</panel>
<panel border="true" left="1" bottom="0" height="208" width="500" label="Nonfriends" name="Nonfriends">
<check_box bottom="-20" left="6" follows="left|top" control_name="AutoresponseNonFriends" name="AutoresponseNonFriends" label="Enable" tool_tip="Send the message in the box below to people who are not your friends"/>
<check_box bottom_delta="0" left_delta="250" follows="left|top" control_name="AutoresponseNonFriendsItem" name="AutoresponseNonFriendsItem" label="Send item"/>
<check_box bottom_delta="0" left_delta="80" follows="left|top" control_name="AutoresponseNonFriendsShow" name="AutoresponseNonFriendsShow" label="Show that this was sent"/>
<text_editor bottom_delta="-147" left="8" font="SansSerifSmall" follows="left|top" height="145" max_length="1100" control_name="AutoresponseNonFriendsMessage" name="AutoresponseNonFriendsMessage" width="480" word_wrap="true" spell_check="true" hide_scrollbar="true"/>
<text_editor bottom_delta="-147" left="8" font="SansSerifSmall" follows="left|top" height="145" max_length="1100" control_name="AutoresponseNonFriendsMessage" name="AutoresponseNonFriendsMessage" width="480" word_wrap="true" spell_check="true" commit_on_focus_lost="true" hide_scrollbar="true"/>
<drop_target bottom_delta="-37" left="8" height="17" width="480" fill_parent="true" control_name="AutoresponseNonFriendsItemID" name="AutoresponseNonFriendsItemID" tool_tip="Drop an item here to have it sent with the above response."/>
</panel>
<panel border="true" left="1" bottom="0" height="208" width="500" label="Muted" name="Muted">
<check_box bottom="-20" left="6" follows="left|top" control_name="AutoresponseMuted" name="AutoresponseMuted" label="Enable" tool_tip="Send the message in the box below to people you have muted."/>
<check_box bottom_delta="0" left_delta="250" follows="left|top" control_name="AutoresponseMutedItem" name="AutoresponseMutedItem" label="Send item"/>
<check_box bottom_delta="0" left_delta="80" follows="left|top" control_name="AutoresponseMutedShow" name="AutoresponseMutedShow" label="Show that this was sent"/>
<text_editor bottom_delta="-147" left="8" font="SansSerifSmall" follows="left|top" height="145" max_length="1100" control_name="AutoresponseMutedMessage" name="AutoresponseMutedMessage" width="480" word_wrap="true" spell_check="true" hide_scrollbar="true"/>
<text_editor bottom_delta="-147" left="8" font="SansSerifSmall" follows="left|top" height="145" max_length="1100" control_name="AutoresponseMutedMessage" name="AutoresponseMutedMessage" width="480" word_wrap="true" spell_check="true" commit_on_focus_lost="true" hide_scrollbar="true"/>
<drop_target bottom_delta="-37" left="8" height="17" width="480" fill_parent="true" control_name="AutoresponseMutedItemID" name="AutoresponseMutedItemID" tool_tip="Drop an item here to have it sent with the above response."/>
</panel>
<panel border="true" left="1" bottom="0" height="208" width="500" label="Busy Mode" name="Busy Mode" tool_tip="Send the message in the box below to people who message when you are busy.">
<check_box bottom="-20" left="258" follows="left|top" control_name="BusyModeResponseItem" name="BusyModeResponseItem" label="Send item"/>
<check_box bottom_delta="0" left_delta="80" follows="left|top" control_name="BusyModeResponseShow" name="BusyModeResponseShow" label="Show that this was sent"/>
<text_editor bottom_delta="-147" left="8" font="SansSerifSmall" follows="left|top" height="145" max_length="1100" control_name="BusyModeResponse" name="BusyModeResponse" width="480" word_wrap="true" spell_check="true" hide_scrollbar="true"/>
<text_editor bottom_delta="-147" left="8" font="SansSerifSmall" follows="left|top" height="145" max_length="1100" control_name="BusyModeResponse" name="BusyModeResponse" width="480" word_wrap="true" spell_check="true" commit_on_focus_lost="true" hide_scrollbar="true"/>
<drop_target bottom_delta="-37" left="8" height="17" width="480" fill_parent="true" control_name="BusyModeResponseItemID" name="BusyModeResponseItemID" tool_tip="Drop an item here to have it sent with the above response."/>
</panel>
</tab_container>

0 comments on commit 5ccfc32

Please sign in to comment.