summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerwindow.cpp
AgeCommit message (Collapse)Author
2012-12-10Correcting a mac build error.William Todd Stinson
2012-12-06CHUI-494: WIP First pass at getting the suppression of events in DND working.William Todd Stinson
2012-12-05merge changes for MAINT-1955, MAINT-1958Nat Goodspeed
2012-12-04Pull and merge viewer-developmentsimon@Simon-PC.lindenlab.com
2012-11-28SH-3563. Pull and merge from viewer-development. Modest code changes to fix ↵prep
alignment issue in llAppearance.
2012-11-27merge changes for DRTVWR-230Oz Linden
2012-11-20Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.William Todd Stinson
2012-11-09Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.William Todd Stinson
2012-11-09CHUI-337 FIXED: To avoid confusion with a classes "...conversation..." and ↵AlexanderP ProductEngine
in accordance with the naming convention in the project, some classes and corresponding files should be renamed: LLIMConversation -> LLFloaterIMSessionTab LLIMFloater -> LLFloaterIMSession LLNearbyChat -> LLFloaterIMNearbyChat LLIMFloaterContainer -> LLFloaterIMContainer LLNearbyChatBarListener -> LLFloaterIMNearbyChatListener LLNearbyChatHandler -> LLFloaterIMNearbyChatHandler
2012-11-08CHUI-484: Updating the code to rather than refer to it as Busy Mode, it now ↵William Todd Stinson
refers to it as Do Not Disturb mode.
2012-11-08Automated merge with http://bitbucket.org/lindenlab/viewer-developmentDave Parks
2012-11-06Pull and merge from https://bitbucket.org/lindenlab/viewer-development.William Todd Stinson
2012-11-02Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.William Todd Stinson
2012-11-02merge back fixes from 3.4.1-beta12Oz Linden
2013-03-26merge changes for 3.5.0-beta5Oz Linden
2013-03-08merge changes for 3.5.0-beta2Oz Linden
2013-02-27finish changes to update handling, including notices of channel changesOz Linden
2013-02-21add menu bar background colors for new build/channel schemeOz Linden
2012-10-31MAINT-646 Fix for leak introduced by optimizations.Dave Parks
2012-10-17merging in latest codeGilbert Gonzales
2012-10-17warn-on-failure:unix-eolGilbert Gonzales
2012-10-17Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/.William Todd Stinson
2012-10-18CHUI-399 (When user has Pressing Letter Keys starts local chat setting on, ↵MaximB ProductEngine
first presses of letter keys do not open chat) fixed
2012-10-16MAINT-1737: Adding a menu option to the Pathfinding menu to allow rebuilding ↵William Todd Stinson
of the region's navmesh.
2012-10-16MAINT-1737: Moving files around to replace the Rebake_Region button with a ↵William Todd Stinson
menu option.
2012-10-11Updating linux build to gcc4.6Don Kjer
2012-10-04Adding optimization to skip alpha image analysis when it isn't needed.Don Kjer
2012-09-27Merging sunshine-experimental into sunshine-internalNyx (Neal Orman)
2012-09-26more state management stuff, DRANO flags for problematic areasBrad Payne (Vir Linden)
2012-09-26error checking, comments for areas needing fix/check in appearanceBrad Payne (Vir Linden)
2012-09-26renamed isUsingBakedTextures to more accurate isUsingServerBakes. Commented ↵Brad Payne (Vir Linden)
some areas we are probably using the function incorrectly
2012-09-23Removing unused gHeadlessClient code from viewerDon Kjer
2012-09-20reapply 448b02f5b56f: MAINT-1147 Fix for frame stall on region crossing.Dave Parks
2012-09-11MAINT-1534 Fix for calls to find widgets getting out of hand.Dave Parks
2012-09-10Backing out the changes contributing to DRTVWR-167 and DRTVWR-179 from the ↵William Todd Stinson
repository.
2012-09-08Automated mergeDon Kjer
2012-09-08Removed most llappearance -> llui dependencies (LLTrans remains). Moved ↵Don Kjer
LLInventoryIcon::EIconName into LLInventoryType. Moved LLInventoryIcon back to newview. Moved LLUI gl_* functions into llrender.
2012-09-07SH-3264 Porting over the XML loading of the avatar structure to llappearanceNyx (Neal Orman)
Moved over the necessary classes to llappearance to support the loading of the avatar's structure & params from file.
2012-09-07CHUI-323 FIXED (Local chat message panel out of position in Conversation ↵AlexanderP ProductEngine
floater): Prevented too early creation LLNearbyChat
2012-11-06Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2012-10-10Introduce new LLDir::findSkinnedFilenames() method. Use as needed.Nat Goodspeed
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.
2012-09-05Merge in latest viewer-developmentsimon@Simon-PC.lindenlab.com
2012-09-04Split gl-specific LLViewerTexture implementation into llrender/LLGLViewerTextureDon Kjer
2012-08-31CHUI-315 (Nearby chat messages do not appear in conversation floater): ↵AlexanderP ProductEngine
cancelled inheritance LLNearbyChat from LLSingleton; set mSingleInstance flag for it.
2012-08-24Automated merge with http://bitbucket.org/lindenlab/viewer-catRichard Linden
2012-08-22CHUI_310 make NearbyChat a singletoneAlexanderP ProductEngine
2012-08-17Merge viewer-development -> sunshineDon Kjer
2012-08-09Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-development.Todd Stinson
2012-08-09Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.Todd Stinson
2012-08-08mergeBrad Payne (Vir Linden)
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 16:43:32 +0000