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

Fix weird gesture deactivation and state-save bug with weird fix.

Browse Source 
Also OCDly replace a NULL with nullptr (not part of the above fix).
This commit is contained in:
Router Gray
2019-07-29 17:55:48 -05:00
parent 6aab72beb8
commit 565153c5f7
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llgesturemgr.cpp
View File

@@ -996,9 +996,9 @@ void LLGestureMgr::onLoadComplete(LLVFS *vfs,
{ {
LLLoadInfo* info = (LLLoadInfo*)user_data; LLLoadInfo* info = (LLLoadInfo*)user_data;
const LLUUID& item_id = info->mItemID; const LLUUID item_id = info->mItemID;
const bool& inform_server = info->mInformServer; const bool inform_server = info->mInformServer;
const bool& deactivate_similar = info->mDeactivateSimilar; const bool deactivate_similar = info->mDeactivateSimilar;
delete info; delete info;
info = nullptr; info = nullptr;

2
indra/newview/llgesturemgr.h
View File

@@ -125,7 +125,7 @@ public:
bool triggerGesture(KEY key, MASK mask); bool triggerGesture(KEY key, MASK mask);
// Trigger all gestures referenced as substrings in this string // Trigger all gestures referenced as substrings in this string
bool triggerAndReviseString(const std::string &str, std::string *revised_string = NULL); bool triggerAndReviseString(const std::string &str, std::string *revised_string = nullptr);
// Does some gesture have this key bound? // Does some gesture have this key bound?
//bool isKeyBound(KEY key, MASK mask) const; //bool isKeyBound(KEY key, MASK mask) const;