summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelplaceinfo.cpp
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2016-01-15 13:36:38 -0800
committerRider Linden <rider@lindenlab.com>2016-01-15 13:36:38 -0800
commite7eaa94dfa1eba24cbf1667190a0be37b2f417e4 (patch)
tree9e9db05ef4d37698a7fa5f68149f724aa569528d /indra/newview/llpanelplaceinfo.cpp
parent34fe371bfdeb6fc83818c58660c038c372c0f64a (diff)
parent5a5c023e291990a463b1a91846ce82c70da8daab (diff)
Merge VR
Diffstat (limited to 'indra/newview/llpanelplaceinfo.cpp')
-rwxr-xr-xindra/newview/llpanelplaceinfo.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanelplaceinfo.cpp b/indra/newview/llpanelplaceinfo.cpp
index cec56a7ae7..0c70aa87c2 100755
--- a/indra/newview/llpanelplaceinfo.cpp
+++ b/indra/newview/llpanelplaceinfo.cpp
@@ -193,7 +193,7 @@ void LLPanelPlaceInfo::setErrorStatus(S32 status, const std::string& reason)
// virtual
void LLPanelPlaceInfo::processParcelInfo(const LLParcelData& parcel_data)
{
- if(parcel_data.snapshot_id.notNull())
+ if(mSnapshotCtrl)
{
mSnapshotCtrl->setImageAssetID(parcel_data.snapshot_id);
}