10 files changed, 32 insertions, 1 deletions

diff --git a/linden/indra/newview/skins/default/xui/de/floater_choose_group.xml b/linden/indra/newview/skins/default/xui/de/floater_choose_group.xml
index dd29aa7..327cb02 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_choose_group.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_choose_group.xml
@@ -5,4 +5,7 @@
         </text>
         <button label="OK" label_selected="OK" name="OK" />
         <button label="Abbrechen" label_selected="Abbrechen" name="Cancel" />
+  <string name="none">
+    keine
+  </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/de/panel_groups.xml b/linden/indra/newview/skins/default/xui/de/panel_groups.xml
index 95a2ef1..a7d6f98 100644
--- a/linden/indra/newview/skins/default/xui/de/panel_groups.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_groups.xml
@@ -12,4 +12,7 @@
         <button label="Verlassen" name="Leave" />
         <button label="Erstellen..." name="Create" />
         <button label="Suchen..." name="Search..." />
+  <string name="none">
+                keine
+  </string>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_choose_group.xml b/linden/indra/newview/skins/default/xui/en-us/floater_choose_group.xml
index 02001e9..f438262 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_choose_group.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_choose_group.xml
@@ -18,4 +18,7 @@
         <button bottom="-236" font="SansSerif" halign="center" height="20" label="Cancel"
              label_selected="Cancel" left_delta="88" mouse_opaque="true" name="Cancel"
              width="80" />
+  <string name="none">
+    none
+  </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml b/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
index 3c860e9..57f955f 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
@@ -70,7 +70,7 @@
         <button bottom_delta="-25" follows="top|right" height="22" label="Mute..."
              left_delta="0" name="mute_btn"
              tool_tip="" width="80" />
-        <button bottom_delta="-25" follows="top|right" height="22" label="Unmute..."
+        <button bottom_delta="0" follows="top|right" height="22" label="Unmute..."
              left_delta="0" name="unmute_btn"
              tool_tip="" width="80" />
         <button bottom_delta="-25" follows="top|right" height="22" label="Report..."
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index 8d55a3b..222a9ad 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -2009,6 +2009,13 @@
       <on_click function="Advanced.ToggleClothingFloater"
                 userdata="" />
     </menu_item_check>
+    <menu_item_check name="Allow Multiple Instances"
+            label="Allow Multiple Instances">
+      <on_click function="Advanced.ToggleMultipleViewers"
+                userdata="" />
+      <on_check function="Advanced.CheckMultipleViewers"
+                userdata="" />
+    </menu_item_check>
     <menu_item_call name="Debug Settings"
                     label="Debug Settings">
       <on_click function="Advanced.ShowDebugSettings"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_groups.xml b/linden/indra/newview/skins/default/xui/en-us/panel_groups.xml
index c47985b..0bc7866 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_groups.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_groups.xml
@@ -36,4 +36,7 @@
              label="Search..." name="Search..." width="80" />
         <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
              label="Leave" name="Leave" width="80" />
+  <string name="none">
+                none
+  </string>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/ja/floater_choose_group.xml b/linden/indra/newview/skins/default/xui/ja/floater_choose_group.xml
index 08c91f1..0e3153c 100644
--- a/linden/indra/newview/skins/default/xui/ja/floater_choose_group.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_choose_group.xml
@@ -5,4 +5,7 @@
         </text>
         <button label="OK" label_selected="OK" name="OK" />
         <button label="取り消し" label_selected="取り消し" name="Cancel" />
+  <string name="none">
+                グループなし
+  </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/ja/panel_groups.xml b/linden/indra/newview/skins/default/xui/ja/panel_groups.xml
index 785fd86..adfdcd4 100644
--- a/linden/indra/newview/skins/default/xui/ja/panel_groups.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_groups.xml
@@ -13,4 +13,7 @@
         <button label="抜ける" name="Leave" />
         <button label="作成..." name="Create" />
         <button label="検索..." name="Search..." />
+  <string name="none">
+                グループなし
+  </string>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/ko/floater_choose_group.xml b/linden/indra/newview/skins/default/xui/ko/floater_choose_group.xml
index 2cb821a..53bb889 100644
--- a/linden/indra/newview/skins/default/xui/ko/floater_choose_group.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_choose_group.xml
@@ -5,4 +5,7 @@
         </text>
         <button label="확인" label_selected="확인" name="OK" />
         <button label="취소" label_selected="취소" name="Cancel" />
+  <string name="none">
+                그룹 없음
+  </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/ko/panel_groups.xml b/linden/indra/newview/skins/default/xui/ko/panel_groups.xml
index cdd28a6..8e66006 100644
--- a/linden/indra/newview/skins/default/xui/ko/panel_groups.xml
+++ b/linden/indra/newview/skins/default/xui/ko/panel_groups.xml
@@ -13,4 +13,7 @@
         <button label="탈퇴" name="Leave" width="90"/>
         <button label="만들기" name="Create" width="90"/>
         <button label="검색" name="Search..." width="90"/>
+  <string name="none">
+                그룹 없음
+  </string>
 </panel>