From 6cc5a7ae57befb3c75113782d75e5e2ff0a03d24 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Sat, 1 Nov 2008 20:10:37 -0500 Subject: Use Imprudence icon on Linux. --- ChangeLog.txt | 3 +++ linden/indra/llwindow/llwindowsdl.cpp | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 4df3539..dfba624 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,5 +1,8 @@ 2008-11-01 Jacek Antonelli + * linden/indra/llwindow/llwindowsdl.cpp: + Use Imprudence icon on Linux. + * linden/indra/newview/CMakeLists.txt: Package up Imprudence icons. * linden/indra/newview/viewer_manifest.py: diff --git a/linden/indra/llwindow/llwindowsdl.cpp b/linden/indra/llwindow/llwindowsdl.cpp index e5d15c4..c088dd8 100644 --- a/linden/indra/llwindow/llwindowsdl.cpp +++ b/linden/indra/llwindow/llwindowsdl.cpp @@ -447,7 +447,7 @@ BOOL LLWindowSDL::createContext(int x, int y, int width, int height, int bits, B // Set the application icon. SDL_Surface *bmpsurface; - bmpsurface = Load_BMP_Resource("ll_icon.BMP"); + bmpsurface = Load_BMP_Resource("imprudence_icon.BMP"); if (bmpsurface) { // This attempts to give a black-keyed mask to the icon. -- cgit v1.1