diff options
author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2011-08-02 17:19:09 -0400 |
---|---|---|
committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2011-08-02 17:19:09 -0400 |
commit | c7b2a88875e21f7610dd3e7c5d3f528b28d5ab55 (patch) | |
tree | a4408b6bdfed37a95f69e16dcab17673cefb6f32 /indra/newview/skins/default/xui/da | |
parent | 9883c33993f7a548c876b43494ffd5835473a211 (diff) | |
parent | 9eb555bbe60e0f388593c489d6c473e4adcbd956 (diff) |
pulling latest viewer-development into mesh merge branch.
Diffstat (limited to 'indra/newview/skins/default/xui/da')
-rw-r--r-- | indra/newview/skins/default/xui/da/notifications.xml | 1 | ||||
-rw-r--r-- | indra/newview/skins/default/xui/da/panel_places.xml | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/da/notifications.xml b/indra/newview/skins/default/xui/da/notifications.xml index 4c0fbd280b..c3999501eb 100644 --- a/indra/newview/skins/default/xui/da/notifications.xml +++ b/indra/newview/skins/default/xui/da/notifications.xml @@ -454,6 +454,7 @@ Købsprisen for dette land er ikke refunderet til ejeren. Hvis en dedikeret parv Dediker disse [AREA] m² land til gruppen '[GROUP_NAME]'? </notification> <notification name="ErrorMessage"> + [ERROR_MESSAGE] <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="AvatarMovedDesired"> diff --git a/indra/newview/skins/default/xui/da/panel_places.xml b/indra/newview/skins/default/xui/da/panel_places.xml index fe8ca69f34..c555f2fb09 100644 --- a/indra/newview/skins/default/xui/da/panel_places.xml +++ b/indra/newview/skins/default/xui/da/panel_places.xml @@ -24,7 +24,7 @@ <menu_button label="▼" name="overflow_btn" tool_tip="Vis flere valg"/> </layout_panel> </layout_stack> - <layout_stack name="bottom_bar_ls3"> + <layout_stack name="bottom_bar_profile_ls"> <layout_panel name="profile_btn_lp"> <button label="Profil" name="profile_btn" tool_tip="Vis profil for sted"/> </layout_panel> |