diff options
| -rwxr-xr-x | indra/llui/llurlentry.cpp | 3 | ||||
| -rwxr-xr-x | indra/newview/llexpandabletextbox.cpp | 2 | ||||
| -rwxr-xr-x | indra/newview/llexpandabletextbox.h | 2 | ||||
| -rw-r--r-- | indra/newview/llpanelexperiencepicker.cpp | 4 | ||||
| -rwxr-xr-x | indra/newview/llpreviewscript.cpp | 1 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_experienceprofile.xml | 3 | ||||
| -rwxr-xr-x | indra/newview/skins/default/xui/en/floater_live_lsleditor.xml | 4 | ||||
| -rwxr-xr-x | indra/newview/skins/default/xui/en/strings.xml | 1 |
8 files changed, 14 insertions, 6 deletions
diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp index 67da98b95a..be08d92c78 100755 --- a/indra/llui/llurlentry.cpp +++ b/indra/llui/llurlentry.cpp @@ -1235,7 +1235,8 @@ std::string LLUrlEntryExperienceProfile::getLabel( const std::string &url, const const LLSD& experience_details = LLExperienceCache::get(experience_id); if(!experience_details.isUndefined()) { - return experience_details[LLExperienceCache::NAME].asString(); + std::string experience_name_string = experience_details[LLExperienceCache::NAME].asString(); + return experience_name_string.empty() ? LLTrans::getString("ExperienceNameUntitled") : experience_name_string; } addObserver(experience_id_string, url, cb); diff --git a/indra/newview/llexpandabletextbox.cpp b/indra/newview/llexpandabletextbox.cpp index a50184460b..f2602c8c7d 100755 --- a/indra/newview/llexpandabletextbox.cpp +++ b/indra/newview/llexpandabletextbox.cpp @@ -116,7 +116,7 @@ LLExpandableTextBox::LLTextBoxEx::LLTextBoxEx(const Params& p) mExpanderVisible(false) { setIsChrome(TRUE); - + setMaxTextLength(p.max_text_length); } void LLExpandableTextBox::LLTextBoxEx::reshape(S32 width, S32 height, BOOL called_from_parent) diff --git a/indra/newview/llexpandabletextbox.h b/indra/newview/llexpandabletextbox.h index 399e48bea2..5dea35bb82 100755 --- a/indra/newview/llexpandabletextbox.h +++ b/indra/newview/llexpandabletextbox.h @@ -103,7 +103,7 @@ public: Optional<LLScrollContainer::Params> scroll; Optional<S32> max_height; - + Optional<bool> bg_visible, expanded_bg_visible; diff --git a/indra/newview/llpanelexperiencepicker.cpp b/indra/newview/llpanelexperiencepicker.cpp index 0a572a8a5c..7592aaa9d0 100644 --- a/indra/newview/llpanelexperiencepicker.cpp +++ b/indra/newview/llpanelexperiencepicker.cpp @@ -108,7 +108,7 @@ BOOL LLPanelExperiencePicker::postBuild() getChild<LLLineEditor>(TEXT_EDIT)->setKeystrokeCallback( boost::bind(&LLPanelExperiencePicker::editKeystroke, this, _1, _2),NULL); childSetAction(BTN_FIND, boost::bind(&LLPanelExperiencePicker::onBtnFind, this)); - getChildView(BTN_FIND)->setEnabled(FALSE); + getChildView(BTN_FIND)->setEnabled(TRUE); LLScrollListCtrl* searchresults = getChild<LLScrollListCtrl>(LIST_RESULTS); searchresults->setDoubleClickCallback( boost::bind(&LLPanelExperiencePicker::onBtnSelect, this)); @@ -140,7 +140,7 @@ BOOL LLPanelExperiencePicker::postBuild() void LLPanelExperiencePicker::editKeystroke( class LLLineEditor* caller, void* user_data ) { - getChildView(BTN_FIND)->setEnabled(caller->getText().size() > 0); + getChildView(BTN_FIND)->setEnabled(caller->getText().size() >= 0); } void LLPanelExperiencePicker::onBtnFind() diff --git a/indra/newview/llpreviewscript.cpp b/indra/newview/llpreviewscript.cpp index 932aa503e9..ffaffbe538 100755 --- a/indra/newview/llpreviewscript.cpp +++ b/indra/newview/llpreviewscript.cpp @@ -1307,6 +1307,7 @@ void LLLiveLSLEditor::updateExperiencePanel() mExperienceEnabled->setEnabled(getIsModifiable()); mExperiences->setVisible(TRUE); mExperienceEnabled->set(TRUE); + getChild<LLButton>("view_profile")->setToolTip(getString("show_experience_profile")); buildExperienceList(); } } diff --git a/indra/newview/skins/default/xui/en/floater_experienceprofile.xml b/indra/newview/skins/default/xui/en/floater_experienceprofile.xml index d146d1306f..2dfba1ac44 100644 --- a/indra/newview/skins/default/xui/en/floater_experienceprofile.xml +++ b/indra/newview/skins/default/xui/en/floater_experienceprofile.xml @@ -182,7 +182,8 @@ name="experience_description" top="0" value="" - width="293"/> + width="293" + textbox.max_length="2048"/> </layout_panel> <layout_panel follows="" diff --git a/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml index 40b47dc1d7..e8826034f6 100755 --- a/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml +++ b/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml @@ -38,6 +38,10 @@ Select to add an experience </floater.string> <floater.string + name="show_experience_profile"> + Click to view the experience profile + </floater.string> + <floater.string name="loading"> Loading... </floater.string> diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index e5ed49fd1b..8ecc5090c7 100755 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -4029,6 +4029,7 @@ Try enclosing path to the editor with double quotes. <!-- Experience Tools strings --> <string name="experience_tools_experience">Experience</string> <string name="ExperienceNameNull">(no experience)</string> + <string name="ExperienceNameUntitled">(untitled experience)</string> <string name="GRID_WIDE">Grid-wide</string> <string name="Allowed_Experiences_Tab">ALLOWED</string> <string name="Blocked_Experiences_Tab">BLOCKED</string> |