summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2012-10-11Change LLDir::findSkinnedFilenames() to use enum instead of bool.Nat Goodspeed
At Richard's suggestion, changed the bool merge parameter to new enum ESkinConstraint with values CURRENT_SKIN and ALL_SKINS. This clarifies what we're requesting at the point of the call.
2012-10-11Use viewer_manifest.py magic to rename embedded html dir to html.old.Nat Goodspeed
Previous attempt at this same feat copied "*/html" and then iterated through every such directory in the copy-target space, renaming each individually with os.rename(). Richard kindly pointed out that it can be done more simply by using a viewer_manifest.py feature permitting wildcards even in dst= args.
2012-10-10Remove HelpUseLocal setting variable. Hide local html skin dir.Nat Goodspeed
We assert that the local html directory is no longer used. Remove machinery related to its use, notably HelpUseLocal, the code that checks it and the code that sets and examines special flag URL "__local". Before actually killing off the local skins/default/html directory, make viewer_manifest.py rename it but continue packaging it as html.old. If this doesn't cause a panic, we can proceed with removing it entirely.
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-13MAINT-1561: BUGFIX Another target omega fix for an issue detected with a ↵William Todd Stinson
clock pendulum.
2012-09-11merge changes for DRTVWR-213Oz Linden
2012-09-10Backing out the changes contributing to DRTVWR-167 and DRTVWR-179 from the ↵William Todd Stinson
repository.
2012-08-27MAINT-1480: Ensuring that the new angular velocity is remembered for later ↵William Todd Stinson
comparison to the previous angular velocity.
2012-08-27PATH-868: Ensuring that walkability values are reset to a previous value if ↵Todd Stinson
the empty string is entered.
2012-08-27MAINT-1480: Clearing the angular velocity accummulation when the updated ↵Todd Stinson
angular velocity is set to zero.
2012-08-22Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.Todd Stinson
2012-08-22PATH-864: Altering the minimum linksets floater size to smaller to allow ↵Todd Stinson
fitting to 1024 width screens.
2012-08-21storm-1906: correct cmake error when using precompiled llphysicsextensions_tpvOz Linden
2012-08-17MAINT-1439: BUGFIX Correcting Kart 1.0 issue with physical objects using ↵Todd Stinson
angular velocity.
2012-08-16merge changes for DRTVWR-197Oz Linden
2012-08-16PATH-852: Attempting to fix the format of the BMP cursors for linux.Todd Stinson
2012-08-14MAINT-1413,MAINT-1425,MAINT-1426: BUGFIX Correcting a problem where the ↵Todd Stinson
build/edit floater was being dirtied at the wrong time.
2012-08-14PATH-842: Another tweak to get the llSetTargetOmega functionality working in ↵Todd Stinson
the viewer.
2012-08-14PATH-856: Adding a new notification to indicate when the user will be ↵Todd Stinson
toggling the phantom flag of a linkset through the Pathfinding Linksets floater.
2012-08-14PATH-854: Adding support to display whether linksets are scripted or not in ↵Todd Stinson
the pathfinding linksets floater.
2012-08-14PATH-849: Group objects were losing their [group] identifier following the ↵Todd Stinson
last commit. This should fix that issue.
2012-08-14PATH-849: Refactoring the behavior after loading the owner name of a ↵Todd Stinson
pathfinding object into the avatar name cache so that each object can simply update its respective row in the scroll list rather than rebuilding from scratch after all names are loaded.
2012-08-14merge changes for DRTVWR-193Oz Linden
2012-08-14merge changes for DRTVWR-195Oz Linden
2012-08-14merge changes for DRTVWR-192Oz Linden
2012-08-13PATH-852: BUGFIX Adding the custom pathfinding cursors to the mac and linux ↵Todd Stinson
builds as apparently they never worked there.
2012-08-13PATH-849: CRASHFIX This should fix the crash caused by ↵Todd Stinson
LLPathfindingObject::handleAvatarNameFetch being called after the corresponding LLPathfindingObject has been deleted.
2012-08-10VWR-29358 : Fix auto scroll to selection when the filter is activeMerov Linden
2012-08-10merge changes for DRTVWR-190Oz Linden
2012-08-09MAINT-1197 : Fix inventory deselection/reselection when cutting itemsMerov Linden
2012-08-09MAINT-1342: correct initial login location handling, clarify the two related ↵Oz Linden
persistent settings
2012-08-09MAINT-113 Fix for flashing property lines when selecting objects.davep@spiral.lindenlab.com
2012-08-06PATH-842, VWR-29431: BUGFIX Correcting a regression introduced by the fix ↵Todd Stinson
for PATH-542. The viewer calculated rotation resulting from an object's angular velocity was being incorrectly reset when the corresponding object update was received. With this bugfix, the rotation resulting from the angular velocity is accumulated separately and is re-appplied when the object update resets the object's rotation.
2012-07-31Path-643. Once the preferences panel is closed (either through ok or ↵prep@lindenlab.com
cancel), the pathing console rebuilds the gfx data.
2012-07-25pull latest pathfinding changes from integration branchOz Linden
2012-07-24Adding a group identifier to the group objects in the pathfinding linksets ↵Todd Stinson
and characters floaters.
2012-07-24merge to viewer-developmentoOz Linden
2012-07-23Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.Todd Stinson
2012-07-23PATH-781: Pulling in the new 'owner_is_group' field into the pathfinding object.Todd Stinson
2012-07-23Fix for path-826. Safeguarding against a mull weight being usedprep
2012-07-18Setting the description column of the linkset floater to be a fixed width. ↵Todd Stinson
Having multiple dynamic width columns apparently prevents other columns from being manually resized by the user.
2012-07-18Updating the build tools floater to better handle multi-line creator and ↵Todd Stinson
owner names.
2012-07-18merge back fixes from 3.3.4-beta5Oz Linden
2012-07-17MAINT-1223 More aggressive rebuilding of render batches when alpha color ↵Dave Parks
values change.
2012-07-17pull back fixes for 3.3.4-beta4Oz Linden
2012-07-16MAINT-1270 Fix for some flexi prims becoming flat at some LoDsDave Parks
2012-07-16MAINT-1223 Fix for alpha updates not triggering LoD updates.Dave Parks
2012-07-16Path-814: Corrected shader fragment compilation error.prep
2012-07-14merge back beta fixes for DRTVWR-180Oz Linden
2012-07-13Disabling the phantom toggle when the object is volume-detect.Todd Stinson