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

Put in some changes along sg1.4 dev history.

Browse Source
This commit is contained in:
Siana Gearz
2010-11-21 04:28:31 +01:00
parent 6866a36a5c
commit d68736da39
182 changed files with 2418 additions and 1151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
indra/newview/lltoolpie.cpp
View File

@@ -708,9 +708,16 @@ BOOL LLToolPie::handleHover(S32 x, S32 y, MASK mask)
{
gViewerWindow->getWindow()->setCursor(UI_CURSOR_HAND);
}
else
{
gViewerWindow->getWindow()->setCursor(UI_CURSOR_ARROW);
}
}
else
{
gViewerWindow->getWindow()->setCursor(UI_CURSOR_ARROW);
// We need to clear media hover flag
if (LLViewerMediaFocus::getInstance()->getMouseOverFlag())
{
@@ -780,7 +787,7 @@ BOOL LLToolPie::handleDoubleClick(S32 x, S32 y, MASK mask)
{
// Hit an object
// Do not go to attachments...
if (!mPick.getObject()->isHUDAttachment())
if (mPick.getObject() && !mPick.getObject()->isHUDAttachment())
{
// HACK: Call the last hit position the point we hit on the object
//gLastHitPosGlobal += gLastHitObjectOffset;