diff --git a/indra/llwindow/llwindowsdl.cpp b/indra/llwindow/llwindowsdl.cpp index 16c5dbe5456b442ca8c4f1a5d2ffec2e89b9a7ba..7cc722301af785a2c00869631e565d414c968ba4 100644 --- a/indra/llwindow/llwindowsdl.cpp +++ b/indra/llwindow/llwindowsdl.cpp @@ -553,7 +553,7 @@ BOOL LLWindowSDL::createContext(int x, int y, int width, int height, int bits, B if (bmpsurface) { // This attempts to give a black-keyed mask to the icon. - SDL_SetColorKey(bmpsurface, SDL_TRUE, SDL_MapRGB(bmpsurface->format, 0, 0, 0)); + SDL_SetColorKey(bmpsurface, SDL_TRUE, SDL_MapRGB(bmpsurface->format, 255, 0, 246)); SDL_SetWindowIcon(mWindow, bmpsurface); // The SDL examples cheerfully avoid freeing the icon // surface, but I'm betting that's leaky. diff --git a/indra/newview/icons/beta/alchemy.icns b/indra/newview/icons/beta/alchemy.icns index 9c3dec8b13eb834069e16d04e4daf0801e412657..13367e8402230d89ad293a30a4e11c97d19aa29e 100644 Binary files a/indra/newview/icons/beta/alchemy.icns and b/indra/newview/icons/beta/alchemy.icns differ diff --git a/indra/newview/icons/beta/alchemy.ico b/indra/newview/icons/beta/alchemy.ico index 7fdb8b9e204518c32d88e5b934c560d8dc96da16..1900d613fca2f9baea60187517772a53fff19fe2 100644 Binary files a/indra/newview/icons/beta/alchemy.ico and b/indra/newview/icons/beta/alchemy.ico differ diff --git a/indra/newview/icons/beta/alchemy_1024.png b/indra/newview/icons/beta/alchemy_1024.png new file mode 100644 index 0000000000000000000000000000000000000000..49049b3e0e41d34fad7ed5a6894c4f377f28f90e Binary files /dev/null and b/indra/newview/icons/beta/alchemy_1024.png differ diff --git a/indra/newview/icons/beta/alchemy_128.png b/indra/newview/icons/beta/alchemy_128.png index 502ff133a670f459192254cc3428d1e860d60fd1..473acb24e102038a8f7ffb721dbcd7c15b8c7071 100644 Binary files a/indra/newview/icons/beta/alchemy_128.png and b/indra/newview/icons/beta/alchemy_128.png differ diff --git a/indra/newview/icons/beta/alchemy_16.png b/indra/newview/icons/beta/alchemy_16.png index b85394173723b3ba298e679f423fc27e3cd12d10..f9ad626520887be9dec54d8f34afe92f0f0e9e18 100644 Binary files a/indra/newview/icons/beta/alchemy_16.png and b/indra/newview/icons/beta/alchemy_16.png differ diff --git a/indra/newview/icons/beta/alchemy_256.BMP b/indra/newview/icons/beta/alchemy_256.BMP index 3154a76aef0d6f02cafee605ce80d7ea725790e0..cd8db479a20c66f1e3e264831034bfbd6cc0aedc 100644 Binary files a/indra/newview/icons/beta/alchemy_256.BMP and b/indra/newview/icons/beta/alchemy_256.BMP differ diff --git a/indra/newview/icons/beta/alchemy_256.png b/indra/newview/icons/beta/alchemy_256.png index d8465fd10618b7e65ed3ccd5ad5f2c851ef1a343..9bf5cdbeb384593725a55bf3eb0cea6f592d4b6b 100644 Binary files a/indra/newview/icons/beta/alchemy_256.png and b/indra/newview/icons/beta/alchemy_256.png differ diff --git a/indra/newview/icons/beta/alchemy_32.png b/indra/newview/icons/beta/alchemy_32.png index 82cd62d4f4baa6499aa101d5f7d63824ba80f56d..60d8944cb9a08e47ca5a3f4cd8f45b3fa1ac10c3 100644 Binary files a/indra/newview/icons/beta/alchemy_32.png and b/indra/newview/icons/beta/alchemy_32.png differ diff --git a/indra/newview/icons/beta/alchemy_48.png b/indra/newview/icons/beta/alchemy_48.png deleted file mode 100644 index 98d04dc2bab77f47eae6234b6490eef054836640..0000000000000000000000000000000000000000 Binary files a/indra/newview/icons/beta/alchemy_48.png and /dev/null differ diff --git a/indra/newview/icons/beta/alchemy_512.png b/indra/newview/icons/beta/alchemy_512.png index 3d0a14262d76df6d7e0ff1f3538a248a0fe09aca..4a46d28567d04917fa2dca8362a69504ddde9c06 100644 Binary files a/indra/newview/icons/beta/alchemy_512.png and b/indra/newview/icons/beta/alchemy_512.png differ diff --git a/indra/newview/icons/beta/alchemy_64.png b/indra/newview/icons/beta/alchemy_64.png new file mode 100644 index 0000000000000000000000000000000000000000..834f9d4632d053d31b77507771f06ccc1e001760 Binary files /dev/null and b/indra/newview/icons/beta/alchemy_64.png differ diff --git a/indra/newview/icons/project/alchemy.icns b/indra/newview/icons/project/alchemy.icns index 9c3dec8b13eb834069e16d04e4daf0801e412657..93220dee459994cf5bdaa4ec98b370f7adfb90d2 100644 Binary files a/indra/newview/icons/project/alchemy.icns and b/indra/newview/icons/project/alchemy.icns differ diff --git a/indra/newview/icons/project/alchemy.ico b/indra/newview/icons/project/alchemy.ico index 7fdb8b9e204518c32d88e5b934c560d8dc96da16..f5514a2ab896e9630d356fed6dfb56dd29975e8e 100644 Binary files a/indra/newview/icons/project/alchemy.ico and b/indra/newview/icons/project/alchemy.ico differ diff --git a/indra/newview/icons/project/alchemy_1024.png b/indra/newview/icons/project/alchemy_1024.png new file mode 100644 index 0000000000000000000000000000000000000000..d31ee3e2720e75ed202cd9c707c135d8686d96bd Binary files /dev/null and b/indra/newview/icons/project/alchemy_1024.png differ diff --git a/indra/newview/icons/project/alchemy_128.png b/indra/newview/icons/project/alchemy_128.png index 502ff133a670f459192254cc3428d1e860d60fd1..90ac9c602f8aec98e1804ff2e1edebdb1d304092 100644 Binary files a/indra/newview/icons/project/alchemy_128.png and b/indra/newview/icons/project/alchemy_128.png differ diff --git a/indra/newview/icons/project/alchemy_16.png b/indra/newview/icons/project/alchemy_16.png index b85394173723b3ba298e679f423fc27e3cd12d10..4255f2f942660f311dc98699d5817e3d45f44e4a 100644 Binary files a/indra/newview/icons/project/alchemy_16.png and b/indra/newview/icons/project/alchemy_16.png differ diff --git a/indra/newview/icons/project/alchemy_256.BMP b/indra/newview/icons/project/alchemy_256.BMP index 3154a76aef0d6f02cafee605ce80d7ea725790e0..548e110743fa445f5b4e32edbea9497f677bf7dd 100644 Binary files a/indra/newview/icons/project/alchemy_256.BMP and b/indra/newview/icons/project/alchemy_256.BMP differ diff --git a/indra/newview/icons/project/alchemy_256.png b/indra/newview/icons/project/alchemy_256.png index d8465fd10618b7e65ed3ccd5ad5f2c851ef1a343..c0f5b289dfa676a5fb2b2655d904b72a94c30329 100644 Binary files a/indra/newview/icons/project/alchemy_256.png and b/indra/newview/icons/project/alchemy_256.png differ diff --git a/indra/newview/icons/project/alchemy_32.png b/indra/newview/icons/project/alchemy_32.png index 82cd62d4f4baa6499aa101d5f7d63824ba80f56d..3c5776cb6d686879d105236d414ad2a05bd9a3dd 100644 Binary files a/indra/newview/icons/project/alchemy_32.png and b/indra/newview/icons/project/alchemy_32.png differ diff --git a/indra/newview/icons/project/alchemy_48.png b/indra/newview/icons/project/alchemy_48.png deleted file mode 100644 index 98d04dc2bab77f47eae6234b6490eef054836640..0000000000000000000000000000000000000000 Binary files a/indra/newview/icons/project/alchemy_48.png and /dev/null differ diff --git a/indra/newview/icons/project/alchemy_512.png b/indra/newview/icons/project/alchemy_512.png index 3d0a14262d76df6d7e0ff1f3538a248a0fe09aca..8511320b30281d191560a791210d129ee22f80ec 100644 Binary files a/indra/newview/icons/project/alchemy_512.png and b/indra/newview/icons/project/alchemy_512.png differ diff --git a/indra/newview/icons/project/alchemy_64.png b/indra/newview/icons/project/alchemy_64.png new file mode 100644 index 0000000000000000000000000000000000000000..951d797299bb3f5ed96561c4755af1a2568df65a Binary files /dev/null and b/indra/newview/icons/project/alchemy_64.png differ diff --git a/indra/newview/icons/release/alchemy.icns b/indra/newview/icons/release/alchemy.icns index 9c3dec8b13eb834069e16d04e4daf0801e412657..344f9f20d5fee96c1d600f828e1641fc56a11252 100644 Binary files a/indra/newview/icons/release/alchemy.icns and b/indra/newview/icons/release/alchemy.icns differ diff --git a/indra/newview/icons/release/alchemy.ico b/indra/newview/icons/release/alchemy.ico index 7fdb8b9e204518c32d88e5b934c560d8dc96da16..66df8d95ce0925151c986de47115636c6406e75c 100644 Binary files a/indra/newview/icons/release/alchemy.ico and b/indra/newview/icons/release/alchemy.ico differ diff --git a/indra/newview/icons/release/alchemy_1024.png b/indra/newview/icons/release/alchemy_1024.png new file mode 100644 index 0000000000000000000000000000000000000000..2d796d23b42d5d91e48e07d038a605d4ad68db66 Binary files /dev/null and b/indra/newview/icons/release/alchemy_1024.png differ diff --git a/indra/newview/icons/release/alchemy_128.png b/indra/newview/icons/release/alchemy_128.png index 502ff133a670f459192254cc3428d1e860d60fd1..671eb63c23268d14a171525331f0c3f4ab3d6c5e 100644 Binary files a/indra/newview/icons/release/alchemy_128.png and b/indra/newview/icons/release/alchemy_128.png differ diff --git a/indra/newview/icons/release/alchemy_16.png b/indra/newview/icons/release/alchemy_16.png index b85394173723b3ba298e679f423fc27e3cd12d10..29e546663cec2ca976d22e368fc183583d9aee2a 100644 Binary files a/indra/newview/icons/release/alchemy_16.png and b/indra/newview/icons/release/alchemy_16.png differ diff --git a/indra/newview/icons/release/alchemy_256.BMP b/indra/newview/icons/release/alchemy_256.BMP index 3154a76aef0d6f02cafee605ce80d7ea725790e0..836e7954a14326dc643ee7247068d8568430cf71 100644 Binary files a/indra/newview/icons/release/alchemy_256.BMP and b/indra/newview/icons/release/alchemy_256.BMP differ diff --git a/indra/newview/icons/release/alchemy_256.png b/indra/newview/icons/release/alchemy_256.png index d8465fd10618b7e65ed3ccd5ad5f2c851ef1a343..4e600284e196c95243db8004eeb92ab1f397ecb2 100644 Binary files a/indra/newview/icons/release/alchemy_256.png and b/indra/newview/icons/release/alchemy_256.png differ diff --git a/indra/newview/icons/release/alchemy_32.png b/indra/newview/icons/release/alchemy_32.png index 82cd62d4f4baa6499aa101d5f7d63824ba80f56d..24ca151858328256be8a693a31c83a81391b1786 100644 Binary files a/indra/newview/icons/release/alchemy_32.png and b/indra/newview/icons/release/alchemy_32.png differ diff --git a/indra/newview/icons/release/alchemy_48.png b/indra/newview/icons/release/alchemy_48.png deleted file mode 100644 index 98d04dc2bab77f47eae6234b6490eef054836640..0000000000000000000000000000000000000000 Binary files a/indra/newview/icons/release/alchemy_48.png and /dev/null differ diff --git a/indra/newview/icons/release/alchemy_512.png b/indra/newview/icons/release/alchemy_512.png index 3d0a14262d76df6d7e0ff1f3538a248a0fe09aca..83efe2392f99fd410d8c6b5316f80ae0fe87d53f 100644 Binary files a/indra/newview/icons/release/alchemy_512.png and b/indra/newview/icons/release/alchemy_512.png differ diff --git a/indra/newview/icons/release/alchemy_64.png b/indra/newview/icons/release/alchemy_64.png new file mode 100644 index 0000000000000000000000000000000000000000..bd03019242430265c46ac2ef0615f2218a26056a Binary files /dev/null and b/indra/newview/icons/release/alchemy_64.png differ diff --git a/indra/newview/icons/test/alchemy.icns b/indra/newview/icons/test/alchemy.icns index 9c3dec8b13eb834069e16d04e4daf0801e412657..8fe25e766248aec629148a5fa71479df7234539e 100644 Binary files a/indra/newview/icons/test/alchemy.icns and b/indra/newview/icons/test/alchemy.icns differ diff --git a/indra/newview/icons/test/alchemy.ico b/indra/newview/icons/test/alchemy.ico index 7fdb8b9e204518c32d88e5b934c560d8dc96da16..3ca3ac1966b508721dbe0f90ec669e2d834fd8a8 100644 Binary files a/indra/newview/icons/test/alchemy.ico and b/indra/newview/icons/test/alchemy.ico differ diff --git a/indra/newview/icons/test/alchemy_1024.png b/indra/newview/icons/test/alchemy_1024.png new file mode 100644 index 0000000000000000000000000000000000000000..35d350043794329cb8a2cca03d480b05258902cb Binary files /dev/null and b/indra/newview/icons/test/alchemy_1024.png differ diff --git a/indra/newview/icons/test/alchemy_128.png b/indra/newview/icons/test/alchemy_128.png index 502ff133a670f459192254cc3428d1e860d60fd1..1eb868dcd22a0b73613d52389c4da224ebbc8ca4 100644 Binary files a/indra/newview/icons/test/alchemy_128.png and b/indra/newview/icons/test/alchemy_128.png differ diff --git a/indra/newview/icons/test/alchemy_16.png b/indra/newview/icons/test/alchemy_16.png index b85394173723b3ba298e679f423fc27e3cd12d10..3427011b026297a35cf32fe20721728a1618de7d 100644 Binary files a/indra/newview/icons/test/alchemy_16.png and b/indra/newview/icons/test/alchemy_16.png differ diff --git a/indra/newview/icons/test/alchemy_256.BMP b/indra/newview/icons/test/alchemy_256.BMP index 3154a76aef0d6f02cafee605ce80d7ea725790e0..5ed4532447588f8e62227b90fbc5c12f702406e5 100644 Binary files a/indra/newview/icons/test/alchemy_256.BMP and b/indra/newview/icons/test/alchemy_256.BMP differ diff --git a/indra/newview/icons/test/alchemy_256.png b/indra/newview/icons/test/alchemy_256.png index d8465fd10618b7e65ed3ccd5ad5f2c851ef1a343..27d06bfbc81c8b4f23004fb102c78cba9e8bf36f 100644 Binary files a/indra/newview/icons/test/alchemy_256.png and b/indra/newview/icons/test/alchemy_256.png differ diff --git a/indra/newview/icons/test/alchemy_32.png b/indra/newview/icons/test/alchemy_32.png index 82cd62d4f4baa6499aa101d5f7d63824ba80f56d..0047143aaf5c2d06184c28ba3ae1786bbdecaf66 100644 Binary files a/indra/newview/icons/test/alchemy_32.png and b/indra/newview/icons/test/alchemy_32.png differ diff --git a/indra/newview/icons/test/alchemy_48.png b/indra/newview/icons/test/alchemy_48.png deleted file mode 100644 index 98d04dc2bab77f47eae6234b6490eef054836640..0000000000000000000000000000000000000000 Binary files a/indra/newview/icons/test/alchemy_48.png and /dev/null differ diff --git a/indra/newview/icons/test/alchemy_512.png b/indra/newview/icons/test/alchemy_512.png index 3d0a14262d76df6d7e0ff1f3538a248a0fe09aca..046950cead29cbea80e2046537029762d6078f37 100644 Binary files a/indra/newview/icons/test/alchemy_512.png and b/indra/newview/icons/test/alchemy_512.png differ diff --git a/indra/newview/icons/test/alchemy_64.png b/indra/newview/icons/test/alchemy_64.png new file mode 100644 index 0000000000000000000000000000000000000000..f04169bbd9c98dd28d30d9ba525fa29d2d966ea1 Binary files /dev/null and b/indra/newview/icons/test/alchemy_64.png differ