Skip to content
Snippets Groups Projects
Commit a1d2b94b authored by Andrey Kleshchev's avatar Andrey Kleshchev
Browse files

SL-14807 Viewer crashes when creating an experience

Opening already open and recently created experience was crashing viewer due to viewer treating 'edit_experience' as part of floater's key.
parent ec824a16
No related branches found
No related tags found
No related merge requests found
...@@ -211,6 +211,20 @@ bool LLFloaterExperienceProfile::experiencePermission( LLHandle<LLFloaterExperie ...@@ -211,6 +211,20 @@ bool LLFloaterExperienceProfile::experiencePermission( LLHandle<LLFloaterExperie
return false; return false;
} }
bool LLFloaterExperienceProfile::matchesKey(const LLSD& key)
{
if (key.has("experience_id"))
{
return mExperienceId == key["experience_id"].asUUID();
}
else if (key.isUUID())
{
return mExperienceId == key.asUUID();
}
// Assume NULL uuid
return mExperienceId.isNull();
}
void LLFloaterExperienceProfile::onClickEdit() void LLFloaterExperienceProfile::onClickEdit()
{ {
......
...@@ -51,6 +51,8 @@ class LLFloaterExperienceProfile : public LLFloater ...@@ -51,6 +51,8 @@ class LLFloaterExperienceProfile : public LLFloater
LLFloaterExperienceProfile(const LLSD& data); LLFloaterExperienceProfile(const LLSD& data);
virtual ~LLFloaterExperienceProfile(); virtual ~LLFloaterExperienceProfile();
/* virtual */ bool matchesKey(const LLSD& key);
LLUUID getExperienceId() const { return mExperienceId; } LLUUID getExperienceId() const { return mExperienceId; }
void setPreferences( const LLSD& content ); void setPreferences( const LLSD& content );
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment