Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge https://github.com/PlayerDagostino/SingularityViewer into future

Browse Source 
Conflicts:
	indra/llplugin/llplugininstance.cpp
	indra/llwindow/llwindowsdl.cpp
	indra/llwindow/llwindowsdl.h
	indra/newview/llpreviewnotecard.cpp
	indra/newview/llviewerwindow.h
This commit is contained in:
Siana Gearz
2011-10-03 16:10:35 +02:00
parent 74dc875a27 b65da876f7
commit 9ac2c07f52
40 changed files with 986 additions and 591 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/lltoolpie.cpp
View File

@@ -660,8 +660,6 @@ BOOL LLToolPie::handleHover(S32 x, S32 y, MASK mask)
*/
gViewerWindow->getWindow()->setCursor(UI_CURSOR_ARROW);
LLViewerObject *object = NULL;
LLViewerObject *parent = NULL;
// object = gViewerWindow->getHoverPick().getObject();