Skip to content
Snippets Groups Projects
  1. Nov 05, 2013
  2. Oct 15, 2013
  3. Sep 05, 2013
  4. Aug 09, 2013
  5. Jun 05, 2013
  6. May 22, 2013
  7. May 20, 2013
  8. Apr 30, 2013
  9. Mar 29, 2013
  10. Mar 13, 2013
  11. Mar 12, 2013
    • Nyx Linden's avatar
      SH-3944 WIP CHUI merge fixing · 1586107e
      Nyx Linden authored
      re-introduced don's refactor of low-level openGL calls pulling out of llui
      and putting them into llrender. Took the new code from their updated versions
      from the CHUI merge, but put them in a place accessible to appearance utility.
      1586107e
  12. Feb 02, 2013
  13. Jan 31, 2013
  14. Jan 25, 2013
  15. Nov 20, 2012
  16. Oct 23, 2012
  17. Oct 12, 2012
    • Nat Goodspeed's avatar
      Fix LLUI::locateSkin() failure case; clarify lldir.cpp static init. · 543b7ee9
      Nat Goodspeed authored
      Per code review:
      Previous refactoring of LLUI::locateSkin() preserved odd failure behavior: it
      would return last-considered pathname, whether or not it exists. Changed to
      emit LL_WARNS log message and return empty string.
      Use Boost.Assign to simplify initialization of a couple static containers in
      lldir.cpp.
      543b7ee9
  18. Oct 10, 2012
    • Nat Goodspeed's avatar
      Introduce new LLDir::findSkinnedFilenames() method. Use as needed. · 3653727e
      Nat Goodspeed authored
      In a number of different places, for different reasons, the viewer wants to
      load a UI-related file that might be overridden by a non-default skin; and
      within that skin, might further be overridden by a non-default language.
      Apparently, for each of those use cases, every individual developer approached
      it as an entirely new problem, solving it idiosyncratically for that one case.
      Not only is this a maintenance problem, but it rubs one's nose in the fact
      that most such solutions consider only a subset of the relevant skin
      directories.
      Richard and I evolved an API intended to address all such cases: a central
      LLDir method returning a list of relevant pathnames, from most general to most
      localized, filtered to present only existing files; plus a couple of
      convenience methods to specifically obtain the most general and most localized
      available file.
      There were several load-skinned-file methods (LLFloater::buildFromFile(),
      LLPanel::buildFromFile() and LLUICtrlFactory::createFromFile() -- apparently
      cloned-and-modified from each other) that contained funky bolted-on logic to
      output the loaded data to an optional passed LLXMLNodePtr param. The trouble
      is that passing that param forced each of these methods to subvert its normal
      search: specifically for that case, it needed to find the baseline XML file
      instead of the localized one. Richard agreed that for the intended usage
      (reformatting XML files) we should use XML schema instead, and that the hacky
      functionality should be removed. Remove it. Also remove
      LLUICtrlFactory::getLocalizedXMLNode(), only used for those three special cases.
      Some callers explicitly passed the optional LLXMLNodePtr param as NULL. Remove
      that.
      Remove LLFloaterUIPreview::displayFloater(save) param, which relied on the
      optional output LLXMLNodePtr param. Make onClickSaveFloater() and
      onClickSaveAll() emit popupAndPrintWarning() about discontinued functionality.
      Recast LLFloater::buildFromFile(), LLPanel::buildFromFile(),
      LLUICtrlFactory::createFromFile(), LLNotifications::loadTemplates(),
      LLUI::locateSkin(), LLFontRegistry::parseFontInfo(),
      LLUIColorTable::loadFromSettings(), LLUICtrlFactory::loadWidgetTemplate(),
      LLUICtrlFactory::getLayeredXMLNode(), LLUIImageList::initFromFile(),
      LLAppViewer::launchUpdater() and LLMediaCtrl::navigateToLocalPage() to use
      findSkinnedFilenames(). (Is LLAppViewer::launchUpdater() ever called any more?
      Apparently so -- though the linux-updater.bin logic to process the relevant
      command-line switch has been disabled. Shrug.) (Is
      LLMediaCtrl::navigateToLocalPage() ever used?? If so, why?)
      Remove LLUI::setupPaths(), getXUIPaths(), getSkinPath() and
      getLocalizedSkinPath(). Remove the skins/paths.xml file read by setupPaths().
      The only configuration it contained was the pair of partial paths "xui/en" and
      "xui/[LANGUAGE]" -- hardly likely to change. getSkinPath() specifically
      returned the first of these, while getLocalizedSkinPath() specifically
      returned the second. This knowledge is now embedded in findSkinnedFilenames().
      Also remove paths.xml from viewer_manifest.py.
      Remove injected xui_paths from LLFontGL::initClass() and
      LLFontRegistry::LLFontRegistry(). These are no longer needed since
      LLFontRegistry can now directly consult LLDir for its path search. Stop
      passing LLUI::getXUIPaths() to LLFontGL::initClass() in LLViewerWindow's
      constructor and initFonts() method.
      Add LLDir::append() and add() methods for the simple task of combining two
      path components separated by getDirDelimiter() -- but only if they're both
      non-empty. Amazing how often that logic is replicated. Replace some existing
      concatenations with add() or append().
      New LLDir::findSkinnedFilenames() method must know current language. Allow
      injecting current language by adding an LLDir::setSkinFolder(language) param,
      and pass it where LLAppViewer::init() and initConfiguration() currently call
      setSkinFolder(). Also add LLDir::getSkinFolder() and getLanguage() methods.
      Change LLFLoaterUIPreview's LLLocalizationResetForcer helper to "forcibly
      reset language" using LLDir::setSkinFolder() instead of LLUI::setupPaths().
      Update LLDir stubs in lldir_stub.cpp and llupdaterservice_test.cpp.
      Add LLDir::getUserDefaultSkinDir() to obtain often-overlooked possible skin
      directory -- like getUserSkinDir() but with "default" in place of the current
      skin name as the last path component. (However, we hope findSkinnedFilenames()
      obviates most explicit use of such individual skin directory pathnames.)
      Add LLDir unit tests for new findSkinnedFilenames() and add() methods -- the
      latter exercises append() as well.
      Tweak indra/integration_tests/llui_libtest/llui_libtest.cpp for all the above.
      Notably, comment out its export_test_floaters() function, since the essential
      LLFloater::buildFromFile(optional LLXMLNodePtr) functionality has been
      removed. This may mean that llui_libtest.cpp has little remaining value, not
      sure.
      3653727e
  19. Oct 09, 2012
  20. Sep 08, 2012
  21. Apr 13, 2012
  22. Apr 17, 2012
  23. Apr 14, 2012
  24. Feb 09, 2012
  25. Feb 07, 2012
  26. Jan 27, 2012
  27. Nov 28, 2011
  28. Nov 15, 2011
  29. Oct 13, 2011
  30. Oct 05, 2011
    • Leslie Linden's avatar
      EXP-1280 FIX -- Minimized floaters associated with toolbar buttons should... · 93e3c8e4
      Leslie Linden authored
      EXP-1280 FIX -- Minimized floaters associated with toolbar buttons should change the state of their parent button
      
      * Toolbar buttons now display green when its corresponding floater is open or
        minimized.
      * Made changes to buttons so flash time and rate is configurable
      * Removed unused "highlight_color" attribute from LLButton
      * Implemented "isVisible" function for toolbar button floaters.  It returns true
        when the floater is visible or minimized.
      * Toolbar floater unminimize now also puts focus to the floater
      * All commands now specify their "is_running_function" for toolbar button state
      * ButtonFlashCount and ButtonFlashRate have been moved to button.xml settings
        and are now configurable on the button.  Toolbar buttons are set to never
        flash and this functionality is used to show which buttons have windows open.
      * All toybox buttons show hover glow even when disabled
      
      Reviewed by Richard.
      93e3c8e4
  31. Sep 30, 2011
    • Richard Nelson's avatar
      param block cleanup · 09e179b2
      Richard Nelson authored
      added Flag as value type
      moved Batch to BatchBlock
      renamed Choice to ChoiceBlock
      made merging of parameters for ValueParams consistent (fillFrom and overwriteFrom are inverses of each other now)
      made iteration over Multiple<T> type params easier
      initial schema param blocks
      09e179b2
  32. Sep 25, 2011
  33. Sep 23, 2011
  34. Sep 21, 2011
    • Leslie Linden's avatar
      EXP-1205 PROGRESS -- As a User, I want a toybox which will contain all buttons... · 412e29ed
      Leslie Linden authored
      EXP-1205 PROGRESS -- As a User, I want a toybox which will contain all buttons that I can d&d into the toolbars
      EXP-1232 FIX -- Create class to load and hold all of the command meta data associated with FUI toolbar actions
      
      * Added basic commands.xml file to define FUI-related toolbar actions.  For now
        a basic "avatar" and "places" button are defined.
      * Added basic command manager to parse and hold strings that define potential
        toolbar command actions.
      * Broke out a separate floater function as a placeholder for the 3-state toolbar
        floater toggling.
      * LLUI::initClass now parses the new commands.xml file
      
      Reviewed by Richard.
      412e29ed
  35. Sep 20, 2011
  36. Sep 19, 2011
  37. Sep 14, 2011
  38. Jul 17, 2011
Loading