summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-01-11Automated merge with ssh://hg.lindenlab.com/richard/viewer-experienceRichard Linden
2012-01-11assert for updating views while drawing was too aggressiveRichard Linden
made assert match actual error condition for list iterators reviewed by Leslie
2012-01-11EXP-1791 - Handle case where initialization with SLM fails in the Merchant ↵Leslie Linden
Outbox floater in the viewer * Added code to clear and re-initialize the SLM cookie when authentication errors are encountered. * Re-organized logic for outbox import a bit to hopefully be more robust when errors are encountered.
2012-01-11PATH-180, buildfix - updating pathing library.Nyx (Neal Orman)
Added a linux version to start building/testing Updated Havok to 2011.3 Updated Havok has new evaluation key built in
2012-01-11Automated merge with ↵Nyx (Neal Orman)
https://bitbucket.org/stinson_linden/viewer-development-havokai
2012-01-11BUILDFIX - updating reference to llpathinglib to use newly built havok versionNyx (Neal Orman)
2012-01-10PATH-142: Pulling the new data fields for position and walkable from the ↵Todd Stinson
ObjectNavmesh capability service. PATH-145: Started building foundation to support filtering of pathfinding linksets.
2012-01-10FIX INTL-89 translation in 8 languages for Set29 including new fileseli
2012-01-10Changed merchant outbox visibility to not persist between sessions.Leslie Linden
2012-01-10PATH-142: Implementing some basic distance from viewer calculation per ↵Todd Stinson
linksets. Note that this does not return all distances because some objects are in the region but the viewer is not aware of yet.
2012-01-10EXP-1783 FIXED Duplicated/missing IDs in menu_viewer.xmlVadim ProductEngine
2012-01-10EXP-1765 (Add debug info) crash on startup at LLWindowWin32::switchContext()callum
2012-01-10STORM-1788 Clarify wording in About Land->Access and tooltips (and similar ↵Jonathan Yap
Estate panel)
2012-01-10EXP-1766 FIXED Disabled updating agent AFK state if the viewer is ↵Seth ProductEngine
disconnected. Possible crash fix.
2012-01-10EXP-1525 FIXED Potential fix for a crash at shutdown: added some error ↵Vadim ProductEngine
handling to saving inventory cache.
2012-01-09PATH-142: Refined the linksets status messaging functionlity.Todd Stinson
2012-01-09PATH-142: Initial pass at hooking up the NavmeshData GET service to the UI.Todd Stinson
2012-01-09EXP-1511 FIX Preview image overlays ui elements in Upload image floatercallum
2012-01-09EXP-1159 FIX -- User can get No transfer items into Merchant Outbox by ↵Leslie Linden
rezzing object from Outbox, including No Transfer item in contents, and then taking back into Inventory * Drag and drop to the 3D world is now disabled from the outbox
2012-01-09sync with viewer-developmenteli
2012-01-09Updating to the latest llpathinglib pre-built package.Todd Stinson
2012-01-09Pull and merge from https://bitbucket.org/lindenlab/viewer-development.Todd Stinson
2012-01-09Merge from viewer-developmentLeslie Linden
2012-01-09Added tag 3.2.6-start for changeset 2174ed1c7129Oz Linden
2012-01-09remove incorrect tagOz Linden
2012-01-09Backed out changeset 4fd359f2f1c3Oz Linden
2012-01-09increment viewer version to 3.2.7Oz Linden
2012-01-09increment viewer version to 3.2.7Oz Linden
2012-01-09Added tag 3.6.0-start for changeset a1012611a195Oz Linden
2012-01-08merge changes for vmrg-213Oz Linden
2012-01-06Updated InventoryOutboxMaxFolderCount to 21 to allow top level folder and 20 ↵Leslie Linden
subfolders in outbox items
2012-01-06sync with viewer-developmenteli
2012-01-06Removing the havok dependency from the viewer build as this is now resolved ↵Todd Stinson
in the llpathinglib library itself.
2012-01-06EXP-1220 GROUNDWORK -- Create context menu entry to allow import of selected ↵Leslie Linden
item(s) * Added a context menu for "Send to Marketplace" but disabled the code to show it until we decide to move forward with this feature. * Made some progress unifying the context menu in the outbox for different types of items. (mesh, audio, etc.)
2012-01-06Looking for better fix to EXP-1693 - date localizationRichard Linden
Backed out changeset: 4f3024e9d629
2012-01-06looking for better fix to EXP-1695Richard Linden
[I18N] [INCORRECT CURRENCY LAYOUT/FORMAT] - Currency in Group Profile > Land/Asset and New Group (French viewer) Backed out changeset: c01a6186b15c
2012-01-06merge changes for vmrg-212Oz Linden
2012-01-06merge changes for vmrg-211Oz Linden
2012-01-06pull back tags from beta and release branchesOz Linden
2012-01-06Add capability-based create folder routine for more reliable inventory, with ↵Aura Linden
fix for copy and wear
2012-01-05trivial: debug code for SH-2827: [crashhunters] Crash in ↵Xiaohong Bao
LLPipeline::generateWaterReflection()
2012-01-05fix for SH-2829: [crashhunters] Crash in ↵Xiaohong Bao
LLWearable::importFile()/LLOverrideBakedTextureUpdate::LLOverrideBakedTextureUpdate()
2012-01-05EXP-1757 FIX -- Merchant Outbox shows as empty when first ↵Leslie Linden
opening/initializing even when populated * Updated merchant outbox floater to not wait for initialization to complete before displaying outbox inventory contents.
2012-01-05correcting a typo in the autobuild.xmlTodd Stinson
2012-01-05EXP-1754 FIX -- Search text shown in Outbox floater after marketplace synch ↵Leslie Linden
if all items removed. * Added a setting to determine whether or not to display the standard empty inventory message. The message is on by default but turned off for the merchant outbox inventory panel.
2012-01-05llpathinglib package updateprep
2012-01-05Some gl state cleanup for physic shapes vbos.'prep
2012-01-05vbos for physics shapes are rendering correctlyprep
2012-01-05Remove already enabled depth testprep
2012-01-05mergeprep