diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-08-06 16:18:45 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-08-06 16:18:45 -0400 |
| commit | 7ede86c97a1a6d903c7d2fc1f15a384d1283d866 (patch) | |
| tree | f678de009c1242abf8f94d59e55fde77b0a04e4b /indra/newview/skins | |
| parent | 7062026da4d6cbdeb6a039f0e6ec387586269c65 (diff) | |
| parent | 4fffc8c8e458ed13993fd0d5bc07ff641cb56005 (diff) | |
merge changes for STORM-2031
Diffstat (limited to 'indra/newview/skins')
| -rwxr-xr-x | indra/newview/skins/default/xui/en/floater_top_objects.xml | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_top_objects.xml b/indra/newview/skins/default/xui/en/floater_top_objects.xml index 0b71177345..36ceddd305 100755 --- a/indra/newview/skins/default/xui/en/floater_top_objects.xml +++ b/indra/newview/skins/default/xui/en/floater_top_objects.xml @@ -38,6 +38,18 @@ name="none_descriptor"> None found. </floater.string> + <floater.string + name="URLs"> + URLs + </floater.string> + <floater.string + name="memory"> + Memory (KB) + </floater.string> + + + + <text type="string" length="1" @@ -82,7 +94,7 @@ name="parcel" width="120" /> <scroll_list.columns - label="Time" + label="Date" name="time" width="130" /> <scroll_list.columns |