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

Update for normal bug EXT-3749 - Clicking landmark attachment on Group notices doesn't open side panel. 

--HG--
branch : product-engine
master
Dmitry Zaporozhan 2010-01-19 18:03:25 +02:00
parent 6fac1bf369
commit f53f65cc1a
4 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
indra/newview/llpanellandmarkinfo.cpp
View File

@ -185,6 +185,13 @@ void LLPanelLandmarkInfo::processParcelInfo(const LLParcelData& parcel_data)
region_z = llround(mPosRegion.mV[VZ]);
}
LLSD info;
info["update_verbs"] = true;
info["global_x"] = parcel_data.global_x;
info["global_y"] = parcel_data.global_y;
info["global_z"] = parcel_data.global_z;
notifyParent(info);
if (mInfoType == CREATE_LANDMARK)
{
if (parcel_data.name.empty())

16
indra/newview/llpanelplaces.cpp
View File

@ -449,6 +449,22 @@ void LLPanelPlaces::setItem(LLInventoryItem* item)
}
}
S32 LLPanelPlaces::notifyParent(const LLSD& info)
{
if(info.has("update_verbs"))
{
if(mPosGlobal.isExactlyZero())
{
mPosGlobal.setVec(info["global_x"], info["global_y"], info["global_z"]);
}
updateVerbs();
return 1;
}
return LLPanel::notifyParent(info);
}
void LLPanelPlaces::onLandmarkLoaded(LLLandmark* landmark)
{
if (!mLandmarkInfo)

2
indra/newview/llpanelplaces.h
View File

@ -75,6 +75,8 @@ public:
std::string getPlaceInfoType() { return mPlaceInfoType; }
/*virtual*/ S32 notifyParent(const LLSD& info);
private:
void onLandmarkLoaded(LLLandmark* landmark);
void onFilterEdit(const std::string& search_string, bool force_filter);

1
indra/newview/llviewermessage.cpp
View File

@ -961,6 +961,7 @@ void open_inventory_offer(const std::vector<LLUUID>& items, const std::string& f
const BOOL auto_open = gSavedSettings.getBOOL("ShowInInventory") &&
(asset_type != LLAssetType::AT_CALLINGCARD) &&
(item->getInventoryType() != LLInventoryType::IT_ATTACHMENT) &&
(asset_type != LLAssetType::AT_LANDMARK) &&
!from_name.empty();
LLInventoryPanel *active_panel = LLInventoryPanel::getActiveInventoryPanel(auto_open);
if(active_panel)