Merge branch 'master' into meshupload

This commit is contained in:
Drake Arconis
2013-01-06 21:46:34 -05:00

View File

@@ -491,7 +491,7 @@ BOOL LLToolCompCreate::handleMouseDown(S32 x, S32 y, MASK mask)
mObjectPlacedOnMouseDown = TRUE;
return TRUE;
return handled;
}
void LLToolCompCreate::pickCallback(const LLPickInfo& pick_info)