aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/skins/default/xui/en-us/notifications.xml
diff options
context:
space:
mode:
authorMcCabe Maxsted2011-04-15 21:07:29 -0700
committerMcCabe Maxsted2011-04-15 21:07:29 -0700
commitf7df6f323e4746abae0a0858cb7ef56bedbb94ca (patch)
tree7a4a9e3be1ca658c0d72c78f413946249a38ad21 /linden/indra/newview/skins/default/xui/en-us/notifications.xml
parenttest commit - slviewer-0-v12500-DeadObjectsFixes_v2.patch (diff)
downloadmeta-impy-f7df6f323e4746abae0a0858cb7ef56bedbb94ca.zip
meta-impy-f7df6f323e4746abae0a0858cb7ef56bedbb94ca.tar.gz
meta-impy-f7df6f323e4746abae0a0858cb7ef56bedbb94ca.tar.bz2
meta-impy-f7df6f323e4746abae0a0858cb7ef56bedbb94ca.tar.xz
Updated the grid manager to save names and passwords along with grid info. This commit includes the following:
* Fixed missing GPL headers from hippo grid manager * Fixed grids named <required> or "" being saved in the list * Fixed grid manager list only showing grid nicks, not grid names * Fixed grid names not settable in the grid manager * Grid manager now remembers avatar names and passwords * Usernames can now be set in the grid manager for SL (needs work) * Fixed grid manager being stuck in an updating state * Some general code cleanup
Diffstat (limited to 'linden/indra/newview/skins/default/xui/en-us/notifications.xml')
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/notifications.xml25
1 files changed, 21 insertions, 4 deletions
diff --git a/linden/indra/newview/skins/default/xui/en-us/notifications.xml b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
index 4d9f6f9..d9b415e 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -7156,11 +7156,14 @@ You need to specify a unique grid nickname.
7156 7156
7157<notification 7157<notification
7158 icon="alertmodal.tga" 7158 icon="alertmodal.tga"
7159 name="GridsNoLoginUri" 7159 name="GridInfoDirty"
7160 type="alertmodal"> 7160 type="alertmodal">
7161Cannot save new grid '[NAME]'. 7161You have unsaved changes that will be lost. Continue?
7162 7162 <usetemplate
7163You need to specify a login URI. 7163 ignoretext="When creating new grids"
7164 name="okcancelignore"
7165 notext="Cancel"
7166 yestext="Continue"/>
7164</notification> 7167</notification>
7165 7168
7166<notification 7169<notification
@@ -7173,6 +7176,13 @@ A grid with the same nickname already exists.
7173</notification> 7176</notification>
7174 7177
7175<notification 7178<notification
7179 icon="alertmodal.tga"
7180 name="GridInfoNoLoginUri"
7181 type="alertmodal">
7182 A login URI is required to retrieve the grid info.
7183</notification>
7184
7185<notification
7176 icon="alertmodal.tga" 7186 icon="alertmodal.tga"
7177 name="GridInfoNoLoginUri" 7187 name="GridInfoNoLoginUri"
7178 type="alertmodal"> 7188 type="alertmodal">
@@ -7216,6 +7226,13 @@ If you don't have an account, would you like to create one now?
7216</notification> 7226</notification>
7217 7227
7218<notification 7228<notification
7229 icon="alertmodal.tga"
7230 name="InvalidPassword"
7231 type="alertmodal">
7232You have entered an invalid password! Please try again.
7233</notification>
7234
7235<notification
7219 icon="alert.tga" 7236 icon="alert.tga"
7220 name="ShowLookAtInfo" 7237 name="ShowLookAtInfo"
7221 type="alert"> 7238 type="alert">