aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llwindow/llwindowsdl.cpp
diff options
context:
space:
mode:
authorDavid Seikel2011-02-13 14:37:44 +1000
committerDavid Seikel2011-02-13 14:37:44 +1000
commite68da291f855b1d8dd0012af67f172a2244936c2 (patch)
tree3e53b84b4ffa856e152cf05b00d2f3db582dd66e /linden/indra/llwindow/llwindowsdl.cpp
parentRevert "Comment out the server tellinsg us what the search URL is, seems the ... (diff)
downloadmeta-impy-e68da291f855b1d8dd0012af67f172a2244936c2.zip
meta-impy-e68da291f855b1d8dd0012af67f172a2244936c2.tar.gz
meta-impy-e68da291f855b1d8dd0012af67f172a2244936c2.tar.bz2
meta-impy-e68da291f855b1d8dd0012af67f172a2244936c2.tar.xz
UNBRANDING! Conservativley remove references to "second life", replacing them with something generic.
Diffstat (limited to 'linden/indra/llwindow/llwindowsdl.cpp')
-rw-r--r--linden/indra/llwindow/llwindowsdl.cpp13
1 files changed, 5 insertions, 8 deletions
diff --git a/linden/indra/llwindow/llwindowsdl.cpp b/linden/indra/llwindow/llwindowsdl.cpp
index 1933888..ff27a4b 100644
--- a/linden/indra/llwindow/llwindowsdl.cpp
+++ b/linden/indra/llwindow/llwindowsdl.cpp
@@ -698,16 +698,14 @@ BOOL LLWindowSDL::createContext(int x, int y, int width, int height, int bits, B
698 close(); 698 close();
699 setupFailure( 699 setupFailure(
700#if LL_SOLARIS && defined(__sparc) 700#if LL_SOLARIS && defined(__sparc)
701 "Second Life requires at least 24-bit color on SPARC to run in a window.\n" 701 "This viewer requires at least 24-bit color on SPARC to run in a window.\n"
702 "Please use fbconfig to set your default color depth to 24 bits.\n" 702 "Please use fbconfig to set your default color depth to 24 bits.\n"
703 "You may also need to adjust the X11 setting in SMF. To do so use\n" 703 "You may also need to adjust the X11 setting in SMF. To do so use\n"
704 " 'svccfg -s svc:/application/x11/x11-server setprop options/default_depth=24'\n" 704 " 'svccfg -s svc:/application/x11/x11-server setprop options/default_depth=24'\n"
705#else 705#else
706 "Second Life requires True Color (32-bit) to run in a window.\n" 706 "This viewer requires True Color (32-bit) to run in a window.\n"
707 "Please go to Control Panels -> Display -> Settings and\n"
708 "set the screen to 32-bit color.\n"
709#endif 707#endif
710 "Alternately, if you choose to run fullscreen, Second Life\n" 708 "Alternately, if you choose to run fullscreen, this viewer\n"
711 "will automatically adjust the screen each time it runs.", 709 "will automatically adjust the screen each time it runs.",
712 "Error", 710 "Error",
713 OSMB_OK); 711 OSMB_OK);
@@ -719,11 +717,10 @@ BOOL LLWindowSDL::createContext(int x, int y, int width, int height, int bits, B
719 { 717 {
720 close(); 718 close();
721 setupFailure( 719 setupFailure(
722 "Second Life is unable to run because it can't get an 8 bit alpha\n" 720 "This viewer is unable to run because it can't get an 8 bit alpha\n"
723 "channel. Usually this is due to video card driver issues.\n" 721 "channel. Usually this is due to video card driver issues.\n"
724 "Please make sure you have the latest video card drivers installed.\n" 722 "Please make sure you have the latest video card drivers installed.\n"
725 "Also be sure your monitor is set to True Color (32-bit) in\n" 723 "Also be sure your monitor is set to True Color (32-bit)n"
726 "Control Panels -> Display -> Settings.\n"
727 "If you continue to receive this message, contact customer service.", 724 "If you continue to receive this message, contact customer service.",
728 "Error", 725 "Error",
729 OSMB_OK); 726 OSMB_OK);