aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/skins/default/xui/hu (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'imprudence/next' into nextDavid Walter Seikel2013-08-301-3/+0
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unless otherwise stated, Imprudence changes accepted. The three images seem to be the same. Conflicts: .gitignore linden/indra/develop.py linden/indra/llcommon/llsdserialize_xml.cpp linden/indra/newview/CMakeLists.txt Manually combined MOAP, OTR, and WL changes from both. linden/indra/newview/app_settings/default_grids.xml Manually merged the grid collection. Also updated IG info. linden/indra/newview/hippoupdate.cpp linden/indra/newview/llettherebelight.cpp Just used the Imprudence copy. linden/indra/newview/llviewermessage.cpp Keep unbranding. linden/indra/newview/llvoavatar.cpp Manually merge client tags. linden/indra/newview/res/viewerRes.rc Manually merge version from Impy. linden/indra/newview/skins/dark/colors_base.xml Keep unbranding. linden/indra/newview/skins/default/html/unabletoconnect.png linden/indra/newview/skins/default/textures/icon_top_pick.tga linden/indra/newview/skins/default/xui/en-us/floater_about.xml Manual merging of contributors. linden/indra/newview/skins/gemini/colors_base.xml Keep unbranding. linden/indra/newview/skins/gemini/textures/icon_top_pick.tga linden/indra/newview/viewer_manifest.py Manually merged boost, gstreamer, OTR, and name. linden/indra/newview/viewerinfo.cpp Manually merge the comment.
| * Fixes http://redmine.kokuaviewer.org/issues/1000 and remove some related ↵David Walter Seikel2012-02-281-3/+0
| | | | | | | | left over cruft.
* | Mostly revert "Adding the meta 7 web site stuff to the help menu. With ↵David Seikel2011-05-021-13/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translations by Ben and Daniel." This mostly reverts commit 0cc783a5043dc65b763efb2f5b91058cc75823d5. Conflicts: linden/indra/newview/skins/default/xui/da/menu_viewer.xml linden/indra/newview/skins/default/xui/de/menu_viewer.xml linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml linden/indra/newview/skins/default/xui/es/menu_viewer.xml linden/indra/newview/skins/default/xui/fr/menu_viewer.xml linden/indra/newview/skins/default/xui/hu/menu_viewer.xml linden/indra/newview/skins/default/xui/it/menu_viewer.xml linden/indra/newview/skins/default/xui/ja/menu_viewer.xml linden/indra/newview/skins/default/xui/ko/menu_viewer.xml linden/indra/newview/skins/default/xui/pl/menu_viewer.xml linden/indra/newview/skins/default/xui/pt/menu_viewer.xml linden/indra/newview/skins/default/xui/ru/menu_viewer.xml linden/indra/newview/skins/default/xui/tr/menu_viewer.xml linden/indra/newview/skins/default/xui/uk/menu_viewer.xml linden/indra/newview/skins/default/xui/zh/menu_viewer.xml
* | Merge remote-tracking branch 'imprudence/exp' into expDavid Seikel2011-04-261-0/+116
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts (for future reference): linden/indra/llcommon/llstring.cpp linden/indra/newview/llpanelnetwork.cpp linden/indra/newview/llselectmgr.cpp linden/indra/newview/llstartup.cpp linden/indra/newview/lltoolmgr.cpp linden/indra/newview/llvoavatar.cpp
| * Tidied up the layout of the right click text menuMcCabe Maxsted2011-04-111-2/+3
| |
| * Applied customizableTranslationMenu.patch by Grandma Bates for #533: Right ↵McCabe Maxsted2011-04-111-0/+115
| | | | | | | | Click menus are transparent on the login screen and #534: Right click menus aren't translatable
* | Fixes bug http://bugs.meta7.com/view.php?id=103, and related issues about ↵David Seikel2011-03-031-1/+0
| | | | | | | | | | | | the text shown during group creation. Languages other than English where just guessed at crudely.
* | Branding Meta7 -> meta 7.David Seikel2011-03-021-3/+3
| |
* | Adding the meta 7 web site stuff to the help menu. With translations by Ben ↵David Seikel2011-02-261-1/+14
| | | | | | | | and Daniel.
* | Unbranding. Todays word is "linden".David Seikel2011-02-251-2/+2
| |
* | Remove special handling of linden estates. We don't have them in meta, and ↵David Seikel2011-02-101-13/+0
|/ | | | | | that sort of policy should be server side anyway. It's good to remove useless code. As usual I found three ways of recognising linden estates being used in the code, makes it hard to find them all. Might be some left over.
* RED-577: SNOW-477: Wrong string raw_file in strings.xml for RAW fileAleric Inglewood2010-10-021-1/+1
| | | | See http://redmine.imprudenceviewer.org/issues/577
* Added the 'Add Friend' option to IMs and fixed the Group Profile button ↵McCabe Maxsted2010-09-131-0/+3
| | | | showing the wrong profile (#514)
* Updated non en-us translations for floater_tools.xml checkbox changeswhere ↵McCabe Maxsted2010-08-281-2/+2
| | | | applicable
* Added option in Preferences > General for setting the default time to 12 ↵McCabe Maxsted2010-07-302-6/+9
| | | | hour/24 hour/UTC. Side effects: moved crash logger settings to advanced prefs, fixed french date translations, past/future dates and times still need to be correctly formatted
* Moved 'Share language with objects' to Preferences > AdvancedMcCabe Maxsted2010-06-191-0/+4
|
* Fixed #231: Non-english languages have messed up profile layouts (note: ↵McCabe Maxsted2010-05-051-39/+39
| | | | classified panel buttons are still a bit off in some languages)
* Applied Kitty Barnett's patch for Search/Replace in notecards.McCabe Maxsted2010-03-112-14/+14
|
* Rebranded new notifications system for all languages.Jacek Antonelli2010-02-261-39/+39
| | | | | | Changed "Second Life" to "Imprudence", etc. Some URLs and SL-specific things have not been rebranded. Added foundation for dynamically rebranding grid names later.
* Merged in 'paymessage' branch.Jacek Antonelli2010-02-032-36/+36
|\ | | | | | | | | Custom message in Pay Resident floater, and XUI cleanup. (SNOW-436, formerly VWR-9597)
| * Improved "Pay Object" floater layout and XML.Jacek Antonelli2010-02-021-21/+22
| |
| * Improved "Pay Resident" floater layout and XML.Jacek Antonelli2010-01-311-15/+14
| |
* | Created drop-down Profile button in IM windowMcCabe Maxsted2010-01-131-1/+1
|/
* Converted 1.23 XUI files to unix line endings.Jacek Antonelli2009-08-29180-12444/+12444
|
* Second Life viewer sources 1.23.4-RCJacek Antonelli2009-06-131-2/+2
|
* Second Life viewer sources 1.23.3-RCJacek Antonelli2009-06-13180-0/+12446