diff options
author | Monty Brandenberg <monty@lindenlab.com> | 2012-09-08 18:56:43 -0400 |
---|---|---|
committer | Monty Brandenberg <monty@lindenlab.com> | 2012-09-08 18:56:43 -0400 |
commit | 4091e47cf206a41cac7ee440b8fd2e2898006685 (patch) | |
tree | 61de24d7aa90171a5fb6481189567fe408d03786 /indra/newview/skins/default/xui/ja/floater_top_objects.xml | |
parent | 81b9e29a1fe227c8f51c6a644b4e2e1afa6bcfb2 (diff) | |
parent | 09cd2a4b1a9f1ddf046fb0ce5d12988b968269a3 (diff) |
DRTVWR-209 Merge of viewer-development with SH-3316 drano-http code.
cmake and other files didn't get moved over, do it by hand.
Diffstat (limited to 'indra/newview/skins/default/xui/ja/floater_top_objects.xml')
-rw-r--r-- | indra/newview/skins/default/xui/ja/floater_top_objects.xml | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/indra/newview/skins/default/xui/ja/floater_top_objects.xml b/indra/newview/skins/default/xui/ja/floater_top_objects.xml index bfc93e5624..c44f409d4e 100644 --- a/indra/newview/skins/default/xui/ja/floater_top_objects.xml +++ b/indra/newview/skins/default/xui/ja/floater_top_objects.xml @@ -9,9 +9,6 @@ <floater.string name="scripts_score_label"> 時間 </floater.string> - <floater.string name="scripts_mono_time_label"> - Monoタイム - </floater.string> <floater.string name="top_colliders_title"> 上部コライダー </floater.string> @@ -32,9 +29,10 @@ <scroll_list.columns label="名前" name="name"/> <scroll_list.columns label="所有者" name="owner"/> <scroll_list.columns label="ロケーション" name="location"/> + <scroll_list.columns label="区画" name="parcel"/> <scroll_list.columns label="時間" name="time"/> - <scroll_list.columns label="Monoタイム" name="mono_time"/> <scroll_list.columns label="URL" name="URLs"/> + <scroll_list.columns label="メモリ(KB)" name="memory"/> </scroll_list> <text name="id_text"> 物体ID: @@ -48,6 +46,10 @@ 所有者: </text> <button label="フィルタ" name="filter_owner_btn"/> + <text name="parcel_name_text"> + 区画: + </text> + <button label="フィルター" name="filter_parcel_btn"/> <button label="更新" name="refresh_btn"/> <button label="選択内容を返却" name="return_selected_btn"/> <button label="すべて返却" name="return_all_btn"/> |