Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer

This commit is contained in:
Siana Gearz
2013-02-03 22:27:53 +01:00
500 changed files with 1323 additions and 115 deletions

View File

@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="floater_inventory_favs.xml" title="Favorites" width="250" height="400" min_width="100" min_height="100" rect_control="FloaterFavoritesRect" can_close="true" can_minimize="true" can_resize="true">
<inventory_panel name="inventory_favs" start_folder="Favorites" follows="all" left="5" right="-5" top="-20" bottom="5" show_item_link_overlays="true"/>
</floater>

View File

@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="floater_my_outfits.xml" title="My Outfits" width="250" height="400" min_width="100" min_height="100" rect_control="FloaterMyOutfitsRect" can_close="true" can_minimize="true" can_resize="true">
<inventory_panel name="my_outfits" start_folder="My Outfits" follows="all" left="5" right="-5" top="-20" bottom="5" show_item_link_overlays="true"/>
</floater>

View File

@@ -568,6 +568,13 @@
</menu_item_call>
<menu_item_separator bottom="-213" enabled="true" height="8" label="-----------" left="0"
mouse_opaque="true" name="separator5" width="185" />
<menu_item_call bottom="-29" height="19" label="My Outfits" left="0" name="My Outfits" width="166">
<on_click function="ShowFloater" userdata="floater_my_outfits.xml" />
</menu_item_call>
<menu_item_call bottom="-29" height="19" label="Favorites" left="0" name="Favorites" width="166">
<on_click function="ShowFloater" userdata="floater_inventory_favs.xml" />
</menu_item_call>
<menu_item_separator bottom="-213" label="-----------" left="0" name="separator5"/>
<menu_item_call bottom="-251" enabled="true" height="19" label="My Land..." left="0"
mouse_opaque="true" name="My Land..." width="185">
<on_click function="ShowFloater" userdata="my land" />

View File

@@ -2759,16 +2759,16 @@ Please choose the male or female avatar. You can change your mind later.
</notification>
<notification
icon="alertmodal.tga"
icon="notify.tga"
name="GrantedModifyRights"
type="alertmodal">
type="notify">
You have been granted the privilege to modify [NAME]&apos;s objects.
</notification>
<notification
icon="alertmodal.tga"
icon="notify.tga"
name="RevokedModifyRights"
type="alertmodal">
type="notify">
Your privilege to modify [NAME]&apos;s objects has been revoked
</notification>
@@ -2890,7 +2890,7 @@ Exceeds the [MAX_AGENTS] [LIST_TYPE] limit by [NUM_EXCESS].
icon="alertmodal.tga"
name="MaxAllowedGroupsOnRegion"
type="alertmodal">
You can only have [MAX_GROUPS] Allowed Groups.
You can only have [MAX_GROUPS] groups.
<usetemplate
name="okcancelbuttons"
notext="Cancel"