diff options
| author | McCabe Maxsted | 2010-04-18 13:21:00 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2010-04-18 13:21:00 -0700 |
| commit | f3c9ad02b027de69322260b0638cbf1454277e0d (patch) | |
| tree | 0941eaa04374d6e84eb1b33b086b0208a74389fd /linden | |
| parent | Use opensim limits for hollow (99) and hole (0.01). Need to add option to ena... (diff) | |
| download | meta-impy-f3c9ad02b027de69322260b0638cbf1454277e0d.zip meta-impy-f3c9ad02b027de69322260b0638cbf1454277e0d.tar.gz meta-impy-f3c9ad02b027de69322260b0638cbf1454277e0d.tar.bz2 meta-impy-f3c9ad02b027de69322260b0638cbf1454277e0d.tar.xz | |
Fixed windows compile error introduced in ca315cbe
Diffstat (limited to 'linden')
| -rw-r--r-- | linden/indra/newview/llappviewerwin32.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/newview/llappviewerwin32.cpp b/linden/indra/newview/llappviewerwin32.cpp index 87be31a..0d5b884 100644 --- a/linden/indra/newview/llappviewerwin32.cpp +++ b/linden/indra/newview/llappviewerwin32.cpp | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * $LicenseInfo:firstyear=2007&license=viewergpl$ | 5 | * $LicenseInfo:firstyear=2007&license=viewergpl$ |
| 6 | * | 6 | * |
| 7 | * Copyright (c) 2007-2009, Linden Research, Inc. | 7 | * Copyright (c) 2007-2010, Linden Research, Inc. |
| 8 | * | 8 | * |
| 9 | * Second Life Viewer Source Code | 9 | * Second Life Viewer Source Code |
| 10 | * The source code in this file ("Source Code") is provided by Linden Lab | 10 | * The source code in this file ("Source Code") is provided by Linden Lab |
| @@ -103,7 +103,7 @@ extern "C" { | |||
| 103 | #endif | 103 | #endif |
| 104 | #endif | 104 | #endif |
| 105 | 105 | ||
| 106 | const std::string LLAppViewerWin32::sWindowClass = "Second Life"; | 106 | const std::string LLAppViewerWin32::sWindowClass = "Imprudence"; |
| 107 | 107 | ||
| 108 | LONG WINAPI viewer_windows_exception_handler(struct _EXCEPTION_POINTERS *exception_infop) | 108 | LONG WINAPI viewer_windows_exception_handler(struct _EXCEPTION_POINTERS *exception_infop) |
| 109 | { | 109 | { |
| @@ -500,7 +500,7 @@ bool LLAppViewerWin32::initHardwareTest() | |||
| 500 | if (OSBTN_NO== button) | 500 | if (OSBTN_NO== button) |
| 501 | { | 501 | { |
| 502 | LL_INFOS("AppInit") << "User quitting after failed DirectX 9 detection" << LL_ENDL; | 502 | LL_INFOS("AppInit") << "User quitting after failed DirectX 9 detection" << LL_ENDL; |
| 503 | LLWeb::loadURLExternal(DIRECTX_9_URL); | 503 | //LLWeb::loadURLExternal(DIRECTX_9_URL); DIRECTX_9_URL removed in ca315cbe -- MC |
| 504 | return false; | 504 | return false; |
| 505 | } | 505 | } |
| 506 | gSavedSettings.setWarning("AboutDirectX9", FALSE); | 506 | gSavedSettings.setWarning("AboutDirectX9", FALSE); |