livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Crash on exit fix + general code cleanup in LLWindowMacOSX.

master
Geenz 2013-01-02 15:57:21 -05:00
parent ddb48d51d9
commit 2b0f50dd82
2 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
indra/llwindow/llwindowmacosx.cpp
View File

@ -283,6 +283,7 @@ void callMouseMoved(float *pos, MASK mask)
outCoords.mX += deltas[0];
outCoords.mY += deltas[1];
gWindowImplementation->getCallbacks()->handleMouseMove(gWindowImplementation, outCoords, gKeyboard->currentMask(TRUE));
}
void callScrollMoved(float delta)
@ -339,9 +340,7 @@ void LLWindowMacOSX::updateMouseDeltas(float* deltas)
if (mCursorDecoupled)
{
mCursorLastEventDeltaX = llround(deltas[0]);
mCursorLastEventDeltaY = llround(-deltas[1]);
mCursorLastEventDeltaY = llround(deltas[1]);
if (mCursorIgnoreNextDelta)
{
@ -372,21 +371,6 @@ BOOL LLWindowMacOSX::createContext(int x, int y, int width, int height, int bits
{
LL_INFOS("Window") << "Creating window..." << LL_ENDL;
mWindow = getMainAppWindow();
/*
LL_INFOS("Window") << "Registering key callbacks..." << LL_ENDL;
registerKeyDownCallback(mWindow, callKeyDown);
registerKeyUpCallback(mWindow, callKeyUp);
registerUnicodeCallback(mWindow, callUnicodeCallback);
registerMouseDownCallback(mWindow, callLeftMouseDown);
registerMouseUpCallback(mWindow, callLeftMouseUp);
registerRightMouseDownCallback(mWindow, callRightMouseDown);
registerRightMouseUpCallback(mWindow, callRightMouseUp);
registerDoubleClickCallback(mWindow, callDoubleClick);
registerMouseMovedCallback(mWindow, callMouseMoved);
registerScrollCallback(mWindow, callScrollMoved);
registerDeltaUpdateCallback(mWindow, callDeltaUpdate);
registerMouseExitCallback(mWindow, callMouseExit);
*/
}
if(mContext == NULL)
@ -395,7 +379,6 @@ BOOL LLWindowMacOSX::createContext(int x, int y, int width, int height, int bits
// Our OpenGL view is already defined within SecondLife.xib.
// Get the view instead.
mGLView = createOpenGLView(mWindow);
//registerResizeEventCallback(mGLView, callResize);
mContext = getCGLContextObj(mGLView);
// Since we just created the context, it needs to be set up.
glNeedsInit = TRUE;

1
indra/newview/llappviewermacosx-delegate.mm
View File

@ -51,7 +51,6 @@
if (appExiting)
{
[frameTimer release];
cleanupViewer();
[[NSApplication sharedApplication] terminate:self];
}
}