summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorYuri Chebotarev <ychebotarev@productengine.com>2009-12-23 14:04:56 +0200
committerYuri Chebotarev <ychebotarev@productengine.com>2009-12-23 14:04:56 +0200
commit24ee9eeb2f3556b6c7a1ba738aca4ec3ebad7275 (patch)
treee02f7e61f7172673663aad6363d49bd51a2299ed /indra
parentfc2596e3c2cc7ca8d9a26cd85ef54c6bb7c17944 (diff)
parent57626b20151a181e1dcf6c4f119f4765ee0f018b (diff)
merge
--HG-- branch : product-engine
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llviewermessage.cpp1
-rw-r--r--indra/newview/skins/default/xui/en/panel_edit_classified.xml1
2 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 519f58ca95..737f7a224d 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -919,7 +919,6 @@ void open_inventory_offer(const std::vector<LLUUID>& items, const std::string& f
LLFloaterReg::showInstance("preview_sound", LLSD(item_id), take_focus);
break;
default:
- LLFloaterReg::showInstance("properties", LLSD(item_id), take_focus);
break;
}
}
diff --git a/indra/newview/skins/default/xui/en/panel_edit_classified.xml b/indra/newview/skins/default/xui/en/panel_edit_classified.xml
index b5760e977f..1fbf7abda9 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_classified.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_classified.xml
@@ -103,6 +103,7 @@
top_pad="2"
max_length="63"
name="classified_name"
+ prevalidate_callback="ascii"
text_color="black"
width="290" />
<text