summaryrefslogtreecommitdiff
path: root/indra/llwindow/llwindowmacosx.h
diff options
context:
space:
mode:
authorGeenz <geenz@geenzo.com>2013-01-01 11:32:53 -0500
committerGeenz <geenz@geenzo.com>2013-01-01 11:32:53 -0500
commitddb48d51d996b18063b111faa3b7e709160074d9 (patch)
treef64cab16299cec07756dea34823ab3749b4d1ec3 /indra/llwindow/llwindowmacosx.h
parent7a1593c083a7ed6e3d6589d5dd656354d748b8ce (diff)
More things in this commit:
- Removed the callback system in favor of simply defining functions in a header to later be implemented in whichever file is most convenient for what we want to do (i.e., calling LLWindow callbacks within LLWindowMacOSX, setting cursors in llwindowmacosx-objc.mm, etc.) - Viewer shutdown now works appropriately - Added a bit of debugging code to test if a key has been handled by the UI or not (useful for tracking down the mystery of the enter key not being handled) - Setup a cocoa quit handler within the application delegate that intercepts any termination requests
Diffstat (limited to 'indra/llwindow/llwindowmacosx.h')
-rw-r--r--indra/llwindow/llwindowmacosx.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llwindow/llwindowmacosx.h b/indra/llwindow/llwindowmacosx.h
index 487af7658f..c5e1b2290b 100644
--- a/indra/llwindow/llwindowmacosx.h
+++ b/indra/llwindow/llwindowmacosx.h
@@ -121,7 +121,7 @@ public:
void* getWindow() { return mWindow; }
LLWindowCallbacks* getCallbacks() { return mCallbacks; }
- void updateMouseDeltas();
+ void updateMouseDeltas(float* deltas);
void getMouseDeltas(float* delta);