summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2014-11-03DD-263 : Update the count on hand on SLM in various situation where stock ↵Merov Linden
count changes (activate, drag/drop, associate, etc...)
2014-11-03Pull in viewer-release and become version 3.7.20simon
2014-11-03SL-93 WIP - pelvis fixup offsetsBrad Payne (Vir Linden)
2014-10-31settings.xml updateBrad Payne (Vir Linden)
2014-10-30SL-93 WIP - missing includeBrad Payne (Vir Linden)
2014-10-30SL-93 - WIP on managing pelvis fixups using new joint offset frameworkBrad Payne (Vir Linden)
2014-10-29merge changes for MAINT-4560Oz Linden
2014-10-28merge changes for 3.7.19-releaseOz Linden
2014-10-28merge changes for 3.7.19-releaseOz Linden
2014-10-28increment viewer version to 3.7.20Oz Linden
2014-10-24DD-243 : Set up callbacks for merchant outbox importer in the postBuildMerov Linden
2014-10-24DD-242 : Added beta invitation message to merchants in the marketplace ↵Merov Linden
listings floater
2014-10-23DD-224, DD-246 : Clean up code when receiving delete notification. Display ↵Merov Linden
DAMA alert when associating listing
2014-10-21DD-224 : WIP : Add a deleteListing method, call SLM_UPDATE_FOLDER ↵Merov Linden
notification if state is deleted
2014-10-21DD-221 : Pointer testing to avoid potential crashMerov Linden
2014-10-21DD-220 : Avoid testing folders against marketplace root if we are not ↵Merov Linden
filtering against the marketplace
2014-10-21merge changes for 3.7.18-releaseOz Linden
2014-10-21Pull merge from lindenlab/viewer-releaseMerov Linden
2014-10-21merge changes for 3.7.18-releaseOz Linden
2014-10-20Merge downsteam viewer-release and become version 3.7.19simon
2014-10-20Merge. Refresh from viewer-release after 3.7.18 release.Monty Brandenberg
2014-10-20increment viewer version to 3.7.19Oz Linden
2014-10-19DD-170 : Set the import callback for Merchant Outbox only when clicking the ↵Merov Linden
import button
2014-10-29MAINT-4606 WIP - handle removing attachments that contain multiple mesh objectsBrad Payne (Vir Linden)
2014-10-15MAINT-4560: turn on display of group title by defaultOz Linden
2014-10-14DD-170 : Check the Merchant Outbox API and hide the menu item if getting ↵Merov Linden
503. Show SLM always.
2014-10-14STORM-2080: correct fitted mesh rendering on some ATI cardsOz Linden
2014-10-14re-fix STORM-1828 (previous fix lost in merge)Oz Linden
2014-10-14Code style cleanups... mostly fixed indentingOz Linden
2014-10-13merge changes for STORM-2056Oz Linden
2014-10-13merge changes for STORM-2053Oz Linden
2014-10-13merge changes for STORM-2078Oz Linden
2014-10-13merge changes for OPEN-268Oz Linden
2014-10-13merge up to 3.7.18Oz Linden
2014-10-08Switched to keying joint offsets by mesh idBrad Payne (Vir Linden)
2014-10-07track avatar size info in avatar debug lineBrad Payne (Vir Linden)
2014-10-06Pull merge from lindenlab/viewer-releaseMerov Linden
2014-10-06DD-170 : Rename enum for consistencyMerov Linden
2014-10-07Merge 3.7.18maksymsproductengine
2014-10-06Merge. Refresh from viewer-release after 3.7.17 release.Monty Brandenberg
2014-10-06increment viewer version to 3.7.18Oz Linden
2014-10-06BUG-7454 Viewer crashes while logging with a turned off "HTTP Inventory"Monty Brandenberg
The HttpRequest objects used in inventory ops are created lazily when needed. The update() operation didn't protect against their not being created. Added some guard tests around the update() operations and we're good.
2014-10-05DD-170 : Handle 503 answer from SLM and added a MARKET_MERCHANT_NOT_MIGRATED ↵Merov Linden
state to the UI, showing only the relevant UI to the user (i.e. Merchant Outbox or Marketplace Listings).
2014-10-04DD-213 : Differentiate pasting from moving when verifying if action is ↵Merov Linden
legit. Also takes into account moving within the same version folder when moving items
2014-10-03DD-174 : Changed the label of the Marketplace listings FUI buttonMerov Linden
2014-10-03DD-174 : WIP : Change the Audit button from an icon to textMerov Linden
2014-10-02DD-174 : WIP : Use the correct icon for the marketplace listing FUI ↵Merov Linden
(toolbar) button
2014-10-01DD-190 : When dismissing an alert, take into account that the last focused ↵Merov Linden
view may have changed since the alert was created
2014-09-30Merge 3.7.17maksymsproductengine
2014-09-28Pull merge from lindenlab/viewer-releaseMerov Linden