aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llwindow
diff options
context:
space:
mode:
authorelektrahesse2010-09-09 18:48:15 +0200
committerelektrahesse2010-09-09 18:48:15 +0200
commitaf338294a706e88ddad4eb0924781c2fe68e0713 (patch)
tree40a04e58809c46e4c37305212103aa3d2849402a /linden/indra/llwindow
parentAdded a Extra tab in adv. preferences to enable/disable chat colors and to se... (diff)
downloadmeta-impy-af338294a706e88ddad4eb0924781c2fe68e0713.zip
meta-impy-af338294a706e88ddad4eb0924781c2fe68e0713.tar.gz
meta-impy-af338294a706e88ddad4eb0924781c2fe68e0713.tar.bz2
meta-impy-af338294a706e88ddad4eb0924781c2fe68e0713.tar.xz
Fixed chat colors and added group im colors
Diffstat (limited to 'linden/indra/llwindow')
-rw-r--r--linden/indra/llwindow/llwindowmacosx-objc.h1
-rw-r--r--linden/indra/llwindow/llwindowmacosx-objc.mm1
-rw-r--r--linden/indra/llwindow/llwindowmacosx.cpp1
3 files changed, 0 insertions, 3 deletions
diff --git a/linden/indra/llwindow/llwindowmacosx-objc.h b/linden/indra/llwindow/llwindowmacosx-objc.h
index ed5d7b1..14cddaa 100644
--- a/linden/indra/llwindow/llwindowmacosx-objc.h
+++ b/linden/indra/llwindow/llwindowmacosx-objc.h
@@ -40,4 +40,3 @@ void setupCocoa();
40CursorRef createImageCursor(const char *fullpath, int hotspotX, int hotspotY); 40CursorRef createImageCursor(const char *fullpath, int hotspotX, int hotspotY);
41OSErr releaseImageCursor(CursorRef ref); 41OSErr releaseImageCursor(CursorRef ref);
42OSErr setImageCursor(CursorRef ref); 42OSErr setImageCursor(CursorRef ref);
43
diff --git a/linden/indra/llwindow/llwindowmacosx-objc.mm b/linden/indra/llwindow/llwindowmacosx-objc.mm
index da01c2a..bc47164 100644
--- a/linden/indra/llwindow/llwindowmacosx-objc.mm
+++ b/linden/indra/llwindow/llwindowmacosx-objc.mm
@@ -116,4 +116,3 @@ OSErr setImageCursor(CursorRef ref)
116 116
117 return noErr; 117 return noErr;
118} 118}
119
diff --git a/linden/indra/llwindow/llwindowmacosx.cpp b/linden/indra/llwindow/llwindowmacosx.cpp
index 613d147..7e7e0af 100644
--- a/linden/indra/llwindow/llwindowmacosx.cpp
+++ b/linden/indra/llwindow/llwindowmacosx.cpp
@@ -3194,7 +3194,6 @@ void LLWindowMacOSX::spawnWebBrowser(const std::string& escaped_url)
3194 } 3194 }
3195} 3195}
3196 3196
3197
3198BOOL LLWindowMacOSX::dialog_color_picker ( F32 *r, F32 *g, F32 *b) 3197BOOL LLWindowMacOSX::dialog_color_picker ( F32 *r, F32 *g, F32 *b)
3199{ 3198{
3200 BOOL retval = FALSE; 3199 BOOL retval = FALSE;