diff options
| author | Cho <cho@lindenlab.com> | 2014-03-12 22:43:31 +0100 |
|---|---|---|
| committer | Cho <cho@lindenlab.com> | 2014-03-12 22:43:31 +0100 |
| commit | de73a3bac4470fc9339568ad1cf4c2af3827c8b8 (patch) | |
| tree | eeb1c5cc54fefa6a303095e1f52cb1211c10a659 /indra | |
| parent | e1337ce16e1575c544906dfb5c396fa7b517f112 (diff) | |
Omit Flickr machine tags for parcel if unnamed
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llfloaterflickr.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/indra/newview/llfloaterflickr.cpp b/indra/newview/llfloaterflickr.cpp index 2377cd7c92..99b275fd0b 100644 --- a/indra/newview/llfloaterflickr.cpp +++ b/indra/newview/llfloaterflickr.cpp @@ -380,8 +380,14 @@ void LLFlickrPhotoPanel::sendPhoto() std::string parcel_name = LLViewerParcelMgr::getInstance()->getAgentParcelName(); std::string region_name = region->getName(); - tags += llformat(" \"%s:region=%s\"", FLICKR_MACHINE_TAGS_NAMESPACE.c_str(), region_name.c_str()); - tags += llformat(" \"%s:parcel=%s\"", FLICKR_MACHINE_TAGS_NAMESPACE.c_str(), parcel_name.c_str()); + if (!region_name.empty()) + { + tags += llformat(" \"%s:region=%s\"", FLICKR_MACHINE_TAGS_NAMESPACE.c_str(), region_name.c_str()); + } + if (!parcel_name.empty()) + { + tags += llformat(" \"%s:parcel=%s\"", FLICKR_MACHINE_TAGS_NAMESPACE.c_str(), parcel_name.c_str()); + } tags += llformat(" \"%s:x=%d\"", FLICKR_MACHINE_TAGS_NAMESPACE.c_str(), pos_x); tags += llformat(" \"%s:y=%d\"", FLICKR_MACHINE_TAGS_NAMESPACE.c_str(), pos_y); tags += llformat(" \"%s:z=%d\"", FLICKR_MACHINE_TAGS_NAMESPACE.c_str(), pos_z); |