aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llui (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'next' of git://github.com/jacek/imprudence into nextDavid Seikel2011-06-044-45/+23
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts (manually merged): linden/indra/llcommon/llversionviewer.h linden/indra/llvfs/lldir.cpp linden/indra/llvfs/lldir_mac.cpp linden/indra/newview/CMakeLists.txt linden/indra/newview/English.lproj/InfoPlist.strings linden/indra/newview/Info-Imprudence.plist linden/indra/newview/Info-meta-impy.plist linden/indra/newview/llappviewer.cpp linden/indra/newview/llpanellogin.cpp linden/indra/newview/packaging/mac/Info.plist.in linden/indra/newview/res/viewerRes.rc linden/indra/newview/skins/default/xui/en-us/floater_about.xml linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml linden/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml linden/indra/newview/skins/default/xui/zh/menu_viewer.xml linden/indra/newview/skins/default/xui/zh/panel_group_general.xml linden/indra/newview/viewer_manifest.py linden/indra/newview/viewerversion.cpp linden/indra/newview/viewerversion.h linden/install.xml Also some post merge tweaks.
| * Fixed #875 by removing menu border introduced in 84ba6c13McCabe Maxsted2011-06-024-43/+15
| | | | | | | | (cherry picked from commit bcfe397d0f3ab2bd8df3f8055f089824dd082bf4)
| * Made LLTextEditor::clear() actually clear the contents of the textbox rather ↵McCabe Maxsted2011-05-271-0/+6
| | | | | | | | than just replace unstyled text
| * fix bug #879 context menu of line + text editors triggers select all even if ↵Armin Weatherwax2011-05-172-2/+2
| | | | | | | | not asked to
* | Merge branch 'libotr' into expDavid Seikel2011-05-122-0/+7
|\ \ | | | | | | | | | | | | | | | Conflicts: linden/indra/llmessage/message.cpp linden/indra/newview/llprefsadvanced.cpp
| * | Allow changing the text on a flyout button.David Seikel2011-04-212-0/+7
| | | | | | | | | | | | Needed for the new OTR UI, and complements the same ability on combo boxes (flyout buttons inherit from combo boxes).
* | | Merge remote-tracking branch 'imprudence/exp' into expDavid Seikel2011-04-268-135/+542
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | 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
| * Don't create temporary LLRect objects for spellchecking in every draw eitherMcCabe Maxsted2011-04-132-2/+2
| |
| * Don't create temporary vectors in spellchecking on every drawMcCabe Maxsted2011-04-134-25/+27
| |
| * Fixed crash in spellchecking when deleting selections while laggingMcCabe Maxsted2011-04-132-24/+30
| |
| * Applied customizableTranslationMenu.patch by Grandma Bates for #533: Right ↵McCabe Maxsted2011-04-116-91/+482
| | | | | | | | Click menus are transparent on the login screen and #534: Right click menus aren't translatable
| * Added search to the Debug SettingsMcCabe Maxsted2011-04-112-0/+8
| |
* | Merge remote-tracking branch 'jacek/exp' into expDavid Seikel2011-04-039-19/+79
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore linden/indra/newview/English.lproj/InfoPlist.strings linden/indra/newview/llpanellogin.cpp linden/indra/newview/res/viewerRes.rc linden/indra/newview/skins/default/xui/en-us/panel_login.xml linden/install.xml Mostly went with my originals, manually merged llpaterrogin.cpp and panel_login.xml.
| * Fixed a crash on login introduced by the new font size labels.Jacek Antonelli2011-04-021-1/+2
| |
| * Added a new default font size FontSansSerifBigger and fixed FontSansSerifBig ↵McCabe Maxsted2011-03-243-4/+10
| | | | | | | | not being named FontSansSerifLarge
| * Comboboxes can now use the font= xui settingMcCabe Maxsted2011-03-234-13/+47
| |
| * Support username logins on Linden grids. Seems to cover most edge cases with ↵McCabe Maxsted2011-03-222-1/+20
| | | | | | | | our current grid manager, but really exposes the weaknesses of not saving login info with the grid, usability-wise. (Note: autologin and the command line need to be tested)
* | Merge remote-tracking branch 'mccabe/exp' into weeklyDavid Seikel2011-03-208-0/+73
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | Conflicts: (Keeping these around as a record, there was some strangeness. .gitignore linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp linden/indra/newview/llfloaterregioninfo.cpp linden/indra/newview/llfloatertos.cpp linden/indra/newview/llpanellogin.cpp linden/indra/newview/skins/default/html/en-us/loading-error/index.html linden/indra/newview/skins/default/html/en-us/loading/loading.html linden/indra/newview/skins/default/xui/en-us/floater_about.xml linden/install.xml
| * #787: Horizontal mouse scrolling support, patch by Kakurady DrakenarMcCabe Maxsted2011-03-098-0/+73
| |
* | Unbranding word of the day is "Second Life".David Seikel2011-02-261-6/+6
| |
* | Unbranding. Todays word is "linden".David Seikel2011-02-254-13/+13
|/
* Merge remote branch 'jacek/SNOW-713' into weeklyMcCabe Maxsted2010-11-121-0/+1
|\
| * IMP-692: SNOW-713: Global objects in libllcommon duplicated in pluginsAleric Inglewood2010-11-071-0/+1
| | | | | | | | | | | | | | | | | | | | See http://jira.secondlife.com/browse/SNOW-713 This patch makes llcommon shared. It contains the following snowglobe (SVN) changesets: 3478, 3479, 3480, 3481, 3482, 3485, 3496, 3498, 3500, 3519 and 3531, plus the fix for all rejects. Note that changes to scripts/automated_build_scripts/opensrc-build.sh (changesets 3500 and 3625) were ignored as we don't have scripts/automated_build_scripts.
* | feature: add a tiny context menu to areasearch scroll list itemsArmin Weatherwax2010-11-092-0/+42
|/ | | | rightclick one of the results and teleport or cam to the object or bring it in edit mode
* Rename hippo* files to lower case (PART 2 OF 2)Aleric Inglewood2010-11-051-1/+1
| | | | | | | | | | | There was a problem with #include "hippolimits.h" because the file is called hippoLimits.h (with an uppercase L). After some discussion on IRC it was reluctantly decided that filenames should be lowercase, as is done for every Linden file. This is part 2 or 2 (the first part just renamed the files). This part changes all files to make the viewer compile again after the renaming.
* Merged webkit_plugins into weekly. Huzzah! The weekly branch now has ↵McCabe Maxsted2010-11-0221-177/+198
|\ | | | | | | browser/media plugin support
| * Merge branch 'weekly' into webkit_pluginsAleric Inglewood2010-10-241-2/+2
| |\ | | | | | | | | | | | | | | | | | | Conflicts: linden/doc/contributions.txt Renamed RED --> IMP. Merged entries from both.
| * | LindenUserDir fixes.Aleric Inglewood2010-10-201-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The LindenUserDir (~/.imprudence/first_last/) cannot be initialized before the user logged in. However, several singletons (that only can be initialized once) depend on this directory for initialization. Therefore we have to take care not to instantiate those singletons until after the user logged in. With regard to webit, this fixes the browser_profile (cache and cookies) directory that the builtin browser uses.
| * | Rename LLRect::isNull to LLRect::isEmpty (a random thing I picked up from ↵Aleric Inglewood2010-10-152-3/+3
| | | | | | | | | | | | snowglobe 2.x).
| * | Merge branch 'mccabe-plugins' into plugins_mergeRobin Cornelius2010-10-1020-172/+186
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: linden/doc/contributions.txt linden/indra/cmake/GStreamer.cmake linden/indra/cmake/LLMedia.cmake linden/indra/cmake/OPENAL.cmake linden/indra/llmedia/CMakeLists.txt linden/indra/llprimitive/material_codes.h linden/indra/newview/chatbar_as_cmdline.cpp linden/indra/newview/llappviewer.cpp linden/indra/newview/llfloatertos.cpp linden/indra/newview/llstartup.cpp linden/indra/newview/llviewerwindow.cpp linden/indra/newview/llvoavatar.cpp linden/indra/newview/pipeline.cpp linden/indra/newview/pipeline.h linden/indra/newview/viewer_manifest.py linden/install.xml
| | * | llmediaplugins first stepArmin Weatherwax2010-09-2320-172/+186
| | | |
| * | | Fix some STL errors highlighted by MSVC debugRobin Cornelius2010-10-091-1/+10
| | | |
* | | | Merges the Message log and Message builder from Inertia in.RevolutionSmythe2010-11-012-0/+28
| |_|/ |/| |
* | | IMP-663: WARNING: replaceSubstitutionStrings: replaceSubstituionStrings ↵Aleric Inglewood2010-10-231-2/+2
| | | | | | | | | | | | | | | | | | | | | FAILURE: value: ignoretext repl: Caused by missing ignoretext in notifications.xml. Also fixed typos in debug output messages.
* | | Fix some STL errors highlighted by MSVC debugRobin Cornelius2010-10-091-1/+10
|/ /
* | Fix bug #611: Context menu spell checker suggestions broken.thickbrick2010-10-072-10/+10
| | | | | | | | | | | | | | | | This fixes a confusion between word end position and word length, causing an empty spell checker suggestion list, or possibly crashes. I caused this bug in f5006e8a2f34afa390f0bbcf0f6af15218cf4105. Oops.
* | Don't leak SpellMenuBind structs when destroying LLLineEditor/LLTextEditor ↵thickbrick2010-10-042-78/+56
| | | | | | | | objects.
* | RED-556: SNOW-800: Massively duplicated objectsAleric Inglewood2010-10-011-96/+96
| | | | | | | | See http://redmine.imprudenceviewer.org/issues/556
* | Fixed Windows compile error introduced in 13b1fd24McCabe Maxsted2010-09-291-1/+1
| |
* | Context menu translator:thickbrick2010-09-284-105/+178
| | | | | | | | | | | | | | | | | | - Don't hide the translate menu, instead only enable the options that make sense in the context (translate languages, copy/paste/etc.) - Made highlighting misspellings a global option, with immediate effect. - Convert newview/lgghunspell_wrapper.cpp to UTF-8.
* | Fixed typo causing menu seperator to not hide.thickbrick2010-09-251-1/+1
| |
* | Context translator: default to enabled.thickbrick2010-09-252-3/+3
| | | | | | | | | | | | Set the default of the xui attribute "allow_translate" to true, and add allow_translate="false" to panel_login.xml. This probably needs to be disabled in other places as well.
* | LLTextEditor context translator: set selection after translation.thickbrick2010-09-251-3/+9
| |
* | LLTextEditor context translator:thickbrick2010-09-252-19/+16
| | | | | | | | | | | | - Added a xui attribute "allow_translate", default to off (not enabled in any xml file yet.) - Only show translate menu if clicked on a word, or something is selected.
* | LLLineEditor context translator:thickbrick2010-09-252-19/+18
| | | | | | | | | | | | - Added a xui attribute "allow_translate", default to off (not enabled in any xml file yet.) - Only show translate menu if clicked on a word, or something is selected.
* | LLLineEditor context translator: re-select text properly.thickbrick2010-09-251-4/+2
| |
* | More LLLineEditor context translator bugfixes:thickbrick2010-09-251-8/+7
| | | | | | | | | | | | - Use LLWString when doing size calculations (potential crashes and misplaced text) - Weird selection range after translating selected text.
* | Fix LLLineEditor context menu translator returning "()" when nothing is ↵thickbrick2010-09-252-12/+81
| | | | | | | | | | | | selected. New behavior is to translate the word under the mouse if nothing is selected.
* | Fix LLTextEditor context menu translator returning "()" when nothing is ↵thickbrick2010-09-252-10/+77
|/ | | | | | selected. New behavior is to translate the word under the mouse if nothing is selected.
* Fixed up the logic for the Hide Misspellings/Show Misspellings menu options. ↵McCabe Maxsted2010-09-164-21/+39
| | | | They now toggle spell check for a specific line/text editor consistently