Added some null checks.

This commit is contained in:
Shyotl
2011-03-02 20:28:59 -06:00
parent 56b327ff97
commit 3c29dd3c20
4 changed files with 58 additions and 22 deletions

View File

@@ -170,11 +170,13 @@ void LLToolMgr::setCurrentTool( LLTool* tool )
mBaseTool = tool;
updateToolStatus();
mSavedTool = NULL;
}
LLTool* LLToolMgr::getCurrentTool()
{
MASK override_mask = gKeyboard->currentMask(TRUE);
MASK override_mask = gKeyboard ? gKeyboard->currentMask(TRUE) : 0;
LLTool* cur_tool = NULL;
// always use transient tools if available