diff options
| author | Eli Linden <eli@lindenlab.com> | 2011-05-13 12:21:35 -0700 | 
|---|---|---|
| committer | Eli Linden <eli@lindenlab.com> | 2011-05-13 12:21:35 -0700 | 
| commit | c7e837f39530ea3c29d2a44b56a0dc6f6333c87f (patch) | |
| tree | 760ec04f1e8d23785d84b3a22788839142afc8d8 | |
| parent | 22e2cee6c03780e927656c7083b0cc32b2d9cf66 (diff) | |
sync up with viewer-development
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_tools.xml | 8 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 2 | 
2 files changed, 5 insertions, 5 deletions
| diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml index 85182c1c28..d0603cb30e 100644 --- a/indra/newview/skins/default/xui/en/floater_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_tools.xml @@ -1856,26 +1856,26 @@ even though the user gets a free copy.              <spinner               follows="left|top"               height="19" -             increment="0.025" +             increment="0.02"               initial_value="0"               label="B"               label_width="10"               layout="topleft"               left_delta="0" -             max_val="0.95" +             max_val="0.98"               name="Path Limit Begin"               top_pad="3"               width="68" />              <spinner               follows="left|top"               height="19" -             increment="0.025" +             increment="0.02"               initial_value="1"               label="E"               label_width="10"               layout="topleft"               left_pad="10" -             min_val="0.05" +             min_val="0.02"               name="Path Limit End"               top_delta="0"               width="68" /> diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 06614dd218..d0dd639249 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -6820,7 +6820,7 @@ Deed to group failed.     name="ReleaseLandThrottled"     type="notifytip">  The parcel [PARCEL_NAME] can not be abandoned at this time. -   tag>fail</tag> +   <tag>fail</tag>    </notification>    <notification | 
