livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIRE-19799: Place details window keeps 'Loading...' estate information

master
Ansariel 2016-08-12 13:04:50 +02:00
parent 3b51603c40
commit 856f060d0a
3 changed files with 43 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
indra/newview/fsfloaterplacedetails.cpp
View File

@ -916,4 +916,26 @@ void FSFloaterPlaceDetails::changedParcelSelection()
updateVerbs();
}
void FSFloaterPlaceDetails::updateEstateName(const std::string& name)
{
if (mPanelPlaceInfo)
{
mPanelPlaceInfo->updateEstateName(name);
}
}
void FSFloaterPlaceDetails::updateEstateOwnerName(const std::string& name)
{
if (mPanelPlaceInfo)
{
mPanelPlaceInfo->updateEstateOwnerName(name);
}
}
void FSFloaterPlaceDetails::updateCovenantText(const std::string &text)
{
if (mPanelPlaceInfo)
{
mPanelPlaceInfo->updateCovenantText(text);
}
}

4
indra/newview/fsfloaterplacedetails.h
View File

@ -65,6 +65,10 @@ public:
static void showPlaceDetails(const LLSD& key);
void updateEstateName(const std::string& name);
void updateEstateOwnerName(const std::string& name);
void updateCovenantText(const std::string &text);
private:
enum ePlaceDisplayInfo
{

17
indra/newview/llviewermessage.cpp
View File

@ -9598,6 +9598,15 @@ void process_covenant_reply(LLMessageSystem* msg, void**)
panel->updateEstateOwnerName(owner_name);
}
// <FS:Ansariel> Standalone location profile floater
FSFloaterPlaceDetails* fs_floater = LLFloaterReg::findTypedInstance<FSFloaterPlaceDetails>("fs_placedetails", LLSD().with("type", "agent"));
if (fs_floater)
{
fs_floater->updateEstateName(estate_name);
fs_floater->updateEstateOwnerName(owner_name);
}
// </FS:Ansariel>
// standard message, not from system
std::string last_modified;
if (covenant_timestamp == 0)
@ -9728,6 +9737,14 @@ void onCovenantLoadComplete(LLVFS *vfs,
{
panel->updateCovenantText(covenant_text);
}
// <FS:Ansariel> Standalone location profile floater
FSFloaterPlaceDetails* fs_floater = LLFloaterReg::findTypedInstance<FSFloaterPlaceDetails>("fs_placedetails", LLSD().with("type", "agent"));
if (fs_floater)
{
fs_floater->updateCovenantText(covenant_text);
}
// </FS:Ansariel>
}