ACME-1635: Trusted Experiences now referred to as Key Experiences.

4 files changed, 12 insertions, 5 deletions

diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp
index be08d92c78..1389ec4bb2 100755
--- a/indra/llui/llurlentry.cpp
+++ b/indra/llui/llurlentry.cpp
@@ -1247,7 +1247,12 @@ std::string LLUrlEntryExperienceProfile::getLabel( const std::string &url, const
 
 void LLUrlEntryExperienceProfile::onExperienceDetails( const LLSD& experience_details )
 {
-    callObservers(experience_details[LLExperienceCache::EXPERIENCE_ID].asString(), experience_details[LLExperienceCache::NAME].asString(), LLStringUtil::null);
+	std::string name = experience_details[LLExperienceCache::NAME].asString();
+	if(name.empty())
+	{
+		name = LLTrans::getString("ExperienceNameUntitled");
+	}
+    callObservers(experience_details[LLExperienceCache::EXPERIENCE_ID].asString(), name, LLStringUtil::null);
 }
 
 
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 8960fad02b..fa5c1cda4a 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -7298,6 +7298,8 @@ Unable to acquire a new experience:
 You do not have access to this destination. You may be allowed into the region by Accepting an experience below:
 
 [EXPERIENCE_LIST]
+
+Other Key Experiences may be available.
   </notification>
     
 
diff --git a/indra/newview/skins/default/xui/en/panel_experience_list_editor.xml b/indra/newview/skins/default/xui/en/panel_experience_list_editor.xml
index 128c721992..e6b88ae534 100644
--- a/indra/newview/skins/default/xui/en/panel_experience_list_editor.xml
+++ b/indra/newview/skins/default/xui/en/panel_experience_list_editor.xml
@@ -23,7 +23,7 @@
    </panel.string>
    <panel.string
       name="panel_trusted">
-      Trusted Experiences:
+      Key Experiences:
    </panel.string>
   <panel.string
     name="no_results">
diff --git a/indra/newview/skins/default/xui/en/panel_region_experiences.xml b/indra/newview/skins/default/xui/en/panel_region_experiences.xml
index 9d06ce6b0c..d909731809 100644
--- a/indra/newview/skins/default/xui/en/panel_region_experiences.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_experiences.xml
@@ -12,11 +12,11 @@
   width="480">
    <panel.string
       name="trusted_estate_text">
-Any Experience may be Trusted.
+Any Experience may be Key.
 
-Trusted Experiences have permission to run on this estate.
+Key Experiences have permission to run on this estate.
 
-Additionally, if the estate does not allow public access, Residents participating in any Trusted Experience may enter the estate and can remain as long as they are in the Experience.
+Additionally, if the estate does not allow public access, Residents participating in any Key Experience may enter the estate and can remain as long as they are in a Key Experience.
    </panel.string>
    <panel.string
       name="allowed_estate_text">