diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-12-07 19:29:39 +0200 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-12-07 19:34:36 +0200 |
| commit | 7ab3de94cd10cb6aa9d1f4a6607366edae101464 (patch) | |
| tree | 8e1df60471b7211c271b102f18e329bdb7dd41a5 /indra/newview | |
| parent | 18b664cd76bd849f0cf55865e4b57837c6d62ead (diff) | |
Revert "SL-14270 Crash accessing deleted 'parent' via callback from child"
There are random inventory's buildViewsTree crashes in branch with SL-14270 commit and there doesn't seem to be anything else inventory related that could have caused those. Reverting commits to see if it fixes crashes.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llconversationmodel.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llconversationmodel.h b/indra/newview/llconversationmodel.h index 9787a263c7..30c7481864 100644 --- a/indra/newview/llconversationmodel.h +++ b/indra/newview/llconversationmodel.h @@ -156,8 +156,7 @@ class LLConversationItemSession : public LLConversationItem public: LLConversationItemSession(std::string display_name, const LLUUID& uuid, LLFolderViewModelInterface& root_view_model); LLConversationItemSession(const LLUUID& uuid, LLFolderViewModelInterface& root_view_model); - virtual ~LLConversationItemSession() {} - + /*virtual*/ bool hasChildren() const; LLPointer<LLUIImage> getIcon() const { return NULL; } void setSessionID(const LLUUID& session_id) { mUUID = session_id; mNeedsRefresh = true; } |