Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear

Conflicts:
	indra/newview/lldynamictexture.cpp
This commit is contained in:
Siana Gearz
2012-03-31 01:54:53 +02:00
17 changed files with 752 additions and 757 deletions

View File

@@ -6887,6 +6887,94 @@ The URL you clicked cannot be opened from this web browser.
Could not get region capability '[CAPABILITY]'.
</notification>
<notification
icon="notifytip.tga"
name="AvatarRezNotification"
type="notifytip">
( [EXISTENCE] seconds alive )
Avatar '[NAME]' declouded after [TIME] seconds.
</notification>
<notification
icon="notifytip.tga"
name="AvatarRezSelfBakedDoneNotification"
type="notifytip">
( [EXISTENCE] seconds alive )
You finished baking your outfit after [TIME] seconds.
</notification>
<notification
icon="notifytip.tga"
name="AvatarRezSelfBakedUpdateNotification"
type="notifytip">
( [EXISTENCE] seconds alive )
You sent out an update of your appearance after [TIME] seconds.
[STATUS]
</notification>
<notification
icon="notifytip.tga"
name="AvatarRezCloudNotification"
type="notifytip">
( [EXISTENCE] seconds alive )
Avatar '[NAME]' became cloud.
</notification>
<notification
icon="notifytip.tga"
name="AvatarRezArrivedNotification"
type="notifytip">
( [EXISTENCE] seconds alive )
Avatar '[NAME]' appeared.
</notification>
<notification
icon="notifytip.tga"
name="AvatarRezLeftCloudNotification"
type="notifytip">
( [EXISTENCE] seconds alive )
Avatar '[NAME]' left after [TIME] seconds as cloud.
</notification>
<notification
icon="notifytip.tga"
name="AvatarRezEnteredAppearanceNotification"
type="notifytip">
( [EXISTENCE] seconds alive )
Avatar '[NAME]' entered appearance mode.
</notification>
<notification
icon="notifytip.tga"
name="AvatarRezLeftAppearanceNotification"
type="notifytip">
( [EXISTENCE] seconds alive )
Avatar '[NAME]' left appearance mode.
</notification>
<notification
icon="notifytip.tga"
name="AvatarRezLeftNotification"
type="notifytip">
( [EXISTENCE] seconds alive )
Avatar '[NAME]' left as fully loaded.
</notification>
<notification
icon="notifytip.tga"
name="AvatarRezSelfBakedTextureUploadNotification"
type="notifytip">
( [EXISTENCE] seconds alive )
You uploaded a [RESOLUTION] baked texture for '[BODYREGION]' after [TIME] seconds.
</notification>
<notification
icon="notifytip.tga"
name="AvatarRezSelfBakedTextureUpdateNotification"
type="notifytip">
( [EXISTENCE] seconds alive )
You locally updated a [RESOLUTION] baked texture for '[BODYREGION]' after [TIME] seconds.
</notification>
<global name="UnsupportedCPU">
- Your CPU speed does not meet the minimum requirements.
</global>