Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Feature Request: Create landmarks with the legacy style names: Parcel, Region (x, y, z)

Browse Source
This commit is contained in:
Lirusaito
2013-07-25 08:06:49 -04:00
parent b1004f9f53
commit 389cf5399e
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/app_settings/settings.xml
View File

@@ -707,6 +707,17 @@
<key>Value</key> <key>Value</key>
<integer>1</integer> <integer>1</integer>
</map> </map>
<key>LiruLegacyLandmarks</key>
<map>
<key>Comment</key>
<string>When creating a new landmark, the legacy format (parcel name, region name (x, y, z)) will be used.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>LiruMapShowAvCount</key> <key>LiruMapShowAvCount</key>
<map> <map>
<key>Comment</key> <key>Comment</key>

2
indra/newview/llviewermenu.cpp
View File

@@ -6058,7 +6058,7 @@ class LLWorldCreateLandmark : public view_listener_t
LLUUID folder_id; LLUUID folder_id;
folder_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_LANDMARK); folder_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_LANDMARK);
std::string pos_string; std::string pos_string;
LLAgentUI::buildLocationString(pos_string); LLAgentUI::buildLocationString(pos_string, gSavedSettings.getBOOL("LiruLegacyLandmarks") ? LLAgentUI::LOCATION_FORMAT_NO_MATURITY : LLAgentUI::LOCATION_FORMAT_LANDMARK);
create_inventory_item(gAgent.getID(), gAgent.getSessionID(), create_inventory_item(gAgent.getID(), gAgent.getSessionID(),
folder_id, LLTransactionID::tnull, folder_id, LLTransactionID::tnull,