diff options
author | Jacek Antonelli | 2008-11-01 20:10:37 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-11-01 20:29:27 -0500 |
commit | 6cc5a7ae57befb3c75113782d75e5e2ff0a03d24 (patch) | |
tree | 713c64828d0d9cf5436e9dbcaad9943631580ff4 | |
parent | Package up Imprudence icons. (diff) | |
download | meta-impy-6cc5a7ae57befb3c75113782d75e5e2ff0a03d24.zip meta-impy-6cc5a7ae57befb3c75113782d75e5e2ff0a03d24.tar.gz meta-impy-6cc5a7ae57befb3c75113782d75e5e2ff0a03d24.tar.bz2 meta-impy-6cc5a7ae57befb3c75113782d75e5e2ff0a03d24.tar.xz |
Use Imprudence icon on Linux.
-rw-r--r-- | ChangeLog.txt | 3 | ||||
-rw-r--r-- | linden/indra/llwindow/llwindowsdl.cpp | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt index 4df3539..dfba624 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt | |||
@@ -1,5 +1,8 @@ | |||
1 | 2008-11-01 Jacek Antonelli <jacek.antonelli@gmail.com> | 1 | 2008-11-01 Jacek Antonelli <jacek.antonelli@gmail.com> |
2 | 2 | ||
3 | * linden/indra/llwindow/llwindowsdl.cpp: | ||
4 | Use Imprudence icon on Linux. | ||
5 | |||
3 | * linden/indra/newview/CMakeLists.txt: | 6 | * linden/indra/newview/CMakeLists.txt: |
4 | Package up Imprudence icons. | 7 | Package up Imprudence icons. |
5 | * linden/indra/newview/viewer_manifest.py: | 8 | * 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 | |||
447 | 447 | ||
448 | // Set the application icon. | 448 | // Set the application icon. |
449 | SDL_Surface *bmpsurface; | 449 | SDL_Surface *bmpsurface; |
450 | bmpsurface = Load_BMP_Resource("ll_icon.BMP"); | 450 | bmpsurface = Load_BMP_Resource("imprudence_icon.BMP"); |
451 | if (bmpsurface) | 451 | if (bmpsurface) |
452 | { | 452 | { |
453 | // This attempts to give a black-keyed mask to the icon. | 453 | // This attempts to give a black-keyed mask to the icon. |