summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2012-10-16sync with viewer-developmenteli
2012-10-16Introduce LLAppViewer::initStrings(); reload default_trans_args.Nat Goodspeed
Calling LLTrans::setDefaultArg() after LLTransUtil::parseStrings() is almost good enough -- but it fails to address the case in which one or more of the default_trans_args strings (e.g. "create_account_url") embeds a reference to the new substitution. So after the setDefaultArg() call, go back through default_trans_args, refetching each string to perform the substitution and updating it with a setDefaultArg() call of its own. All this is way too much logic to replicate in both LLAppViewer::initConfiguration() and init(), so break out new LLAppViewer::initStrings() method and call it from both places.
2012-10-16pull back changes from 3.4.1-beta8Oz Linden
2012-10-15MAINT-1721 Fix for crash when clicking "back" button after editing appearance.Dave Parks
Reviewed by VoidPointer
2012-10-15Add 'sourceid' settings var specifically for skin-files insertion.Nat Goodspeed
Add logic after (both!) LLTransUtil::parseStrings() calls to ensure that "[sourceid]" embedded in (e.g.) strings.xml content will be replaced.
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-11MAINT-1709 Factor out reallocDave Parks
Reviewed by VoidPointer
2012-10-10pull back 3.4.1-beta6 fixesOz Linden
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-10DRTVWR-225 Cleanup assertionsDave Parks
2012-10-10Pull and merge from ssh://hg@bitbucket.org/oz_linden/viewer-beta-drtvwr-179.William Todd Stinson
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-10-10merge changes for DRTVWR-226Oz Linden
2012-10-09MAINT-1688 Potential fix for crash on exit in LLTextureFetchDave Parks
2012-10-04merge changes for DRTVWR-222Oz Linden
2012-10-04Merge from Nat's repo - SWAT-711: Create Mac app bundle symlinks only for ↵Jeff (Gioffredo Linden)
.dylib files that exist. Previous viewer_manifest.py unconditionally created Mac symlinks for all expected .dylib files. Recent change to revert to statically linking llcommon means we no longer build libllcommon.dylib, therefore we no longer copy it, therefore any symlink to that library will be broken by definition. Change to create symlinks for .dylib files that were successfully copied.
2012-10-03MergeChris Baker
2012-10-03- Fixed an issue where group list wouldn't fall back to UDP if the region ↵Chris Baker
doesn't support the new GroupMemberData capabaility - Fixed a potential null pointer crash. Thanks to Ansariel from Firestorm for these! Reviewer: Myself
2012-10-03Fix for testsDave Parks
2012-10-03Fix non-thread-safe refcounting of LLHTTPClient::Responder and fix ↵Dave Parks
out-of-order deletion of LLTextureFetch on shutdown
2012-10-02Instrument debug builds on windows to help track down source of heap corruptionDave Parks
2012-10-02Adding libtcmalloc to the linux installer package.William Todd Stinson
2012-10-02Fix up some assertions in lloctree.hDave Parks
2012-10-01Only enable breakpad error handing if crash reporting is enabledDave Parks
2012-09-27Yet another attempt at deleting tcmallocDave Parks
2012-09-27Another attempt at deleting tcmalloc_minimal.dllDave Parks
2012-09-27Modify installer to remove libtcmalloc_minimal.dllDave Parks
2012-09-20Pull and merge from ↵William Todd Stinson
ssh://hg@bitbucket.org/stinson_linden/viewer-beta-drtvwr-179.
2012-09-20Correcting dynamic allocation issues with classes that have aligned data ↵William Todd Stinson
members.
2012-09-20reapply 04fdf7945708: MAINT-775 Fix for particle index pool corruption on ↵Dave Parks
teleport.
2012-09-20reapply 51dcb8c70f33: MAINT-442: [PUBLIC]Unable to change parcel ↵simon@Simon-PC.lindenlab.com
restrictions for a scripts-disabled parcel in a damage-enabled region. Reviewed by Kelly
2012-09-20reapply 72c9af4eec84: MAINT-840 VWR-28604 DEV-2548: [PUBLIC]Object by ↵simon@Simon-PC.lindenlab.com
multiple creators shows creator as "(unknown)" in Inventory. Now shows "(unknown / multiple)". Reviewed by Kelly
2012-09-20reapply c77cea5c6e41: MAINT-646 Cleanup some warnings from previous changes.Dave Parks
2012-09-20reapply 448b02f5b56f: MAINT-1147 Fix for frame stall on region crossing.Dave Parks
2012-09-20reapply 8a625610cd5d: MAINT-1161: non standard sea level not correctly ↵simon@Simon-PC.lindenlab.com
rendered around private islands. Reviewed by Kelly
2012-09-20reapply fde2ac0276e2: MAINT-646 Get rid of a hotspot in ↵Dave Parks
LLViewerObjectList::update, fix for error in llpolymorph
2012-09-20reapply b0148737d316: MAINT-646 Optimize LLVolumeImplFlexible::doIdleUpdate()Dave Parks
2012-09-20reapply 71673401390a: MAINT-646 Knock out some extraneous performance timersDave Parks
2012-09-20reapply 668dcacd6e76: MAINT-646 Vectorize LLPolyMeshDave Parks
2012-09-20reapply b895285ab0de: MAINT-646 Don't spend so much time fetching avatar ↵Dave Parks
physics params.
2012-09-20reapply 0f20bb7cb9ee: MAINT-1147 Don't rebuild volume meshes on region crossing.Dave Parks
2012-09-20reapply 52b6c9168974: MAINT-646 Factor std::set out of lloctreeDave Parks
2012-09-20reapply 15b05dc53770: MAINT-646 Profile based optimization -- add a lookup ↵Dave Parks
map for joints to remove hotspot in LLJoint::findJoint
2012-09-20reapply 4f8ca653a394: Fix for linux build.Dave Parks
2012-09-20reapply 38b7779af5f9: MAINT-646 Faster traversal of render batch lists.Dave Parks
2012-09-18SWAT-711: Create Mac app bundle symlinks only for .dylib files that exist.Nat Goodspeed
Previous viewer_manifest.py unconditionally created Mac symlinks for all expected .dylib files. Recent change to revert to statically linking llcommon means we no longer build libllcommon.dylib, therefore we no longer copy it, therefore any symlink to that library will be broken by definition. Change to create symlinks for .dylib files that were successfully copied.
2012-09-17pull back fixes from 3.4.0-beta7Oz Linden
2012-09-13MAINT-1561: BUGFIX Another target omega fix for an issue detected with a ↵William Todd Stinson
clock pendulum.
2012-09-12MAINT-1456,MAINT-1519,PATH-879: BUGFIX Correcting behavior for objects moved ↵William Todd Stinson
by scripts so that the drawable is properly updated with the updated location.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 08:52:19 +0000