summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-01-09Backed out changeset 4fd359f2f1c3Oz Linden
2012-01-09mergeBrad Payne (Vir 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
2012-01-05WIP: Navmesh vbos rendering fixes (added normal and color maps).prep
2012-01-05Merge with viewer-experienceLeslie Linden
2012-01-05EXP-1753 FIX -- Open Merchant Outbox floater when user selects copy to ↵Leslie Linden
Merchant Outbox context menu option in Inventory * Modified "copy to merchant outbox" and "move to merchant outbox" context menu actions to also open the merchant outbox floater * Changed context menu behavior to always preserve disabled menu items on multiselect rather than occasionally ignoring it
2012-01-05mergeDebi King (Dessie)
2012-01-05Automated merge with https://bitbucket.org/lindenlab/viewer-developmentRichard Linden
2012-01-05Removed unused code for old outbox error reportingLeslie Linden
2012-01-05Latest from viewer-experienceLeslie Linden
2012-01-05 path-149 overlay of navmesh on onto renderablesprep
2012-01-04trivial: debug code for SH-2828: [crashhunters] Crash in ↵Xiaohong Bao
LLRefCount::unref(), bad stacks
2012-01-04Modified CRASH assert to not occur in release mode per RichardLeslie Linden
2012-01-04Merge from viewer-experienceLeslie Linden
2012-01-04EXP-1769 FIX -- Crash in ASSERT (mInDraw == false) - can trigger with ↵Leslie Linden
selecting build tool * Fixed build window to not fail assert at construction time.
2012-01-04Updating to the latest llpathing library pre-built package.Todd Stinson
2012-01-04Pull and merge from ↵Todd Stinson
https://bitbucket.org/stinson_linden/viewer-development-havokai.
2012-01-04Hijaking the land status messaging for temporary development of the ↵Todd Stinson
pathfinding linksets floater.
2012-01-04Merge from viewer-developmentLeslie Linden
2012-01-04reconciled .hgtagsDebi King (Dessie)
2012-01-04Added tag DRTVWR-107_3.2.5-beta2, 3.2.5-beta2 for changeset 65a2c1c8d855Debi King (Dessie)
2012-01-04Added tag DRTVWR-106_3.2.5-beta1, 3.2.5-beta1 for changeset 3d2d5d244c63Debi King (Dessie)
2012-01-04Merge from viewer-experienceLeslie Linden
2012-01-04EXP-1738 FIX -- Disable drag and drop to folders in the outbox that would ↵Leslie Linden
create a hierarchy that contains too many folders * Updated drag and drop to correctly handle moving to and from outbox as opposed to within the outbox when dealing with folder and item count limitations related to depth and total folder count.
2012-01-04Automated merge with ↵Xiaohong Bao
https://bitbucket.org/VirLinden/viewer-development-shining-fixes
2012-01-04fix for SH-2823 and SH-2824: crash in curl: LLBufferArray::countAfter() and ↵Xiaohong Bao
LLBufferArray::copyIntoBuffers reviewed by vir
2012-01-04Updated llpathinglib dependencyprep