summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2012-07-09BUGFIX: Correcting a crash issue that was caused by the rebake navmesh ↵Todd Stinson
callback handler unexpectedly changing the navmesh state.
2012-07-09merge changes for DRTVWR-175Oz Linden
2012-07-09correct dos line endingsOz Linden
2012-07-09Merge lindenlab/viewer-development => don_linden/viewer-horde-fixesDon Kjer
2012-07-09SH-3171 FIX switched texture pipeline to use the new cap request URLNyx (Neal Orman)
If we support server side texture baking, requests for baked textures will go through the http url received at login.
2012-07-09merge back more late beta fixes from 3.3.4Oz Linden
2012-07-09merge changes for DRTVWR-177Oz Linden
2012-07-09Skipping shiftObject pipeline method in headless modeDon Kjer
2012-07-08merge changes for DRTVWR-176Oz Linden
2012-07-08merge up to latest integration branchOz Linden
2012-07-08merge changes for DRTVWR-176Oz Linden
2012-07-06Automated merge with ssh://hg.lindenlab.com/simon/viewmasterXiaohong Bao
2012-07-06fix for MAINT-1201: 404 errors appear in the log when opening the world mapXiaohong Bao
2012-07-06mergeBrad Payne (Vir Linden)
2012-07-06Automated merge with https://bitbucket.org/VirLinden/dranoXiaohong Bao
2012-07-06fix for SH-3234: Map tile fetching broken in drano buildXiaohong Bao
2012-07-06trivial: convert to Unix line endings.Xiaohong Bao
2012-07-06MAINT-1228 FIX Can not put more than one object into the contents of an objectcallum
Reviewed by Paul PE
2012-07-05Adding the pathfinding attributes to the object profile panel.Todd Stinson
2012-07-05partial changes for building with the llphysicsextensions source packageOz Linden
2012-07-05successful build with llphysicsextensions stubOz Linden
2012-07-05begin integrating building of llphysicsextensions from source here (incomplete)Oz Linden
2012-07-03MAINT-1231 Investigate increasing MAX_CACHED_GROUPS in llgroupmgr.cppKelly Washington
* increased max groups to 20 * changed cache to LRU instead of 'delete half when overfull' reviewed with Baker
2012-07-03Adding an import for the new RelWithDebInfo build of the physics extensions ↵Todd Stinson
library.
2012-07-03PATH-805: guard all uses of sInstance in LLPanelLoginOz Linden
2012-07-03FIX INTL-99 set32 translation for 8 languageseli
2012-07-03MAINT-685 Fix for disabling basic shaders making high detail terrain render ↵Dave Parks
incorrectly.
2012-07-03remove some cmake output that is no longer neededOz Linden
2012-07-03merge up to latest pathfinding project viewerOz Linden
2012-07-03PATH-802: fixed check for different grid in chat SLURLSOz Linden
2012-07-03Added more rendering-code early-exits when in headless mode.Don Kjer
2012-07-02MAINT-971 : [PUBLIC]Renaming a new inventory item while filtering item namessimon@Simon-PC.lindenlab.com
renames parent folder instead. Reviewed by Kelly
2012-07-02FIX: renamed UpdateAgentAppearance to UpdateAvatarAppearanceNyx (Neal Orman)
2012-07-02merge back changes from 3.3.4-beta2Oz Linden
2012-07-02improve logging of invalid grid definitions, prevent clashes with old viewersOz Linden
2012-07-02disable alignment tests in debug builds (where they fail)Oz Linden
2012-06-29Ensuring that the code and tests build correctly when HACKED_GODLIKE_VIEWER ↵Todd Stinson
is defined.
2012-06-29PATH-797: BUGFIX Altering how the rows are being added to the scrolllist ↵Todd Stinson
widget to avoid a regression that occurred after merging from viewer-release recently caused the time to load a large number of elements to increase substainally.
2012-06-29SH-3229 FIX suppress baked texture cache requests and generated ↵Nyx (Neal Orman)
agentAppearance messages If you're using the new pipeline, then we should not be requesting cached baked textures from the simulator. Nor should we be sending agentAppearance messages to the simulator (note: this may change in the future on region arrive)
2012-06-29Added test back in, skip() call need to be removed.simon@Simon-PC.lindenlab.com
2012-06-29Merge simon/viewmaster-merge for latest maint worksimon@Simon-PC.lindenlab.com
2012-06-29merge changes for DRTVWR-174Oz Linden
2012-06-29Fix --skin command-line switch by mapping to the correct var name.Nat Goodspeed
It said it mapped to 'SkinFolder', which doesn't exist. 'SkinCurrent' is correct.
2012-06-29Specialize Steam skin by adding sourceid= to join.secondlife.com URL.Nat Goodspeed
Of course, preserve lang= localization from default skin. Assume that localized steam/xui/*/strings.xml file without create_account_url key will default to create_account_url key from steam/xui/en/strings.xml. That's how it works in the default skin, anyway.
2012-06-29Add 'steam' skin, initially only strings.xml, identical to default.Nat Goodspeed
Splitting the 'add' from modifications unique to this skin facilitates code review.
2012-06-29Make Russian and Turkish viewers link to join.secondlife.com lang=.Nat Goodspeed
We have appropriate translations of the join.secondlife.com registration path, but the Russian and Turkish [create_account_url] strings in strings.xml didn't specify them. At Eli's request, added lang= params to these two.
2012-06-29Use [create_account_url] from strings.xml consistently in notifications.xml.Nat Goodspeed
The URL whose simple form is http://join.secondlife.com actually appears in a number of places in the localized notifications.xml files. It's supposed to be localized for the current viewer language -- and in strings.xml, it is. But the same URL is restated a couple times in notifications.xml, sometimes localized, sometimes not. Add "create_account_url" to init_default_trans_args(), permitting us to embed [create_account_url] anywhere in the skin files. Then replace all known occurrences of that URL in notifications.xml files with [create_account_url].
2012-06-29Merge with viewer-betacallum
2012-06-29SH-3226 WIP - request appearance update request, connects to ↵Brad Payne (Vir Linden)
UpdateAgentAppearance cap, in updateAppearanceFromCOF()
2012-06-28Ensuring that the Show in Linksets and Show in Characters right-click menu ↵Todd Stinson
option is only show on pathfinding-enabled regions.