summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2014-01-17MAINT-3536 FIXED new crash in XML_ParserFree: temporary solutionmaksymsproductengine
2014-01-16Pulled merge from viewer-release.Aura Linden
2014-01-15MAINT-3397 : fix to use slurl for localization handler for ↵simon
EstateManagerFailedllTeleportHome message
2014-01-14Some cleanup of string to wstring conversion and vice versa.Aura Linden
2014-01-10Merge after backoutsimon
2014-01-10Revert earlier back-out for MAINT-535 ... it's back insimon
2014-01-09Automated merge with http://bitbucket.org/lindenlab/viewer-interestingXiaohong Bao
2014-01-09fix for SH-4659:crash at LLOcclusionCullingGroup::doOcclusion line 1150Xiaohong Bao
2014-01-09Merge. Refresh from viewer-release after 3.6.13 release.Monty Brandenberg
2014-01-09merge with releaseRichard Linden
2014-01-09SH-4667 HTTP Viewer reports network error instead of a misnamed joint on ↵Monty Brandenberg
mesh upload Tried to add consistent mesh upload retries in the HTTP work but a combination of bad status choices in the upload service and the one-shot nature of the upload capabilities means that status information can be lost. For now, retain the wonderful manual retry logic. At some future point, we might fix the services or add application-level retry.
2014-01-09Merge with 3.6.13dolphin
2014-01-09Merge 3.6.14 from releasesimon
2014-01-08merge changes for 3.6.13-releaseOz Linden
2014-01-08increment viewer version to 3.6.14Oz Linden
2014-01-08trivial: convert to unix line endings.Xiaohong Bao
2014-01-08MAINT-3591 FIXED Remove "Start Second LIfe now?" dialogue in the installermaksymsproductengine
2014-01-14MAINT-3412 add gpu_table line with distinct Intel Iris Pro OpenGL regex to ↵Graham Linden
match new MBP with forced Intel graphics
2014-01-14mergeMaximB ProductEngine
2014-01-14MAINT-3262 FIXED Allow uploading gif-imagesMnikolenko ProductEngine
2014-01-14MAINT-3510 (Incorrect context menu entry in Places floater)MaximB ProductEngine
2014-01-13MAINT-3621 FIXED Set name to "Unnamed" if object's name consists of whitespaces.Mnikolenko ProductEngine
2014-01-10MAINT-3364 FIXED Call clearSelection() from root_folderMnikolenko ProductEngine
2014-01-09Merge downstream -bearsimon
2014-01-09Merge 3.6.14simon
2014-01-08Fix linux buildSimon Linden
2014-01-07Revert changes made for MAINT-535 to test in a release cohort.simon
2014-01-07merge changes for Snowstorm fall contributionsOz Linden
2014-01-07merge changes for storm-1980Oz Linden
2014-01-06fix a compiling error for mac and linux.Xiaohong Bao
2014-01-06fix for SH-4656: crash at LLVOCacheEntry::updateParentBoundingInfo() line 510Xiaohong Bao
2014-01-04STORM-1980 Center floater on screen. Tweak shaking parameters.Jonathan Yap
2014-01-03change shaking to decay exponentiallyOz Linden
2014-01-03STORM-1980 Small optimization and tweaks of shaking constantsJonathan Yap
2014-01-03STORM-1980 Add shake effectJonathan Yap
2014-01-03merge changes for 3.6.12-releaseOz Linden
2014-01-02increment version to 3.7.0Oz Linden
2014-01-02merge changes for 3.6.12-releaseOz Linden
2014-01-02MAINT-3592 (Viewer opening square textures should set the 1:1 size constraint)MaximB ProductEngine
2014-01-02STORM-1980 Remove callback in destructor.Jonathan Yap
Shrink floater and add a "!" icon in the top left corner.
2014-01-01MAINT-3592 (Viewer opening square textures should set the 1:1 size constraint)MaximB ProductEngine
2013-12-26MAINT-3570 FIXED Callbacks for menu item are added.Mnikolenko ProductEngine
2013-12-21MAINT-3587 FIXED settings.xml still references avatarsunited.com for ↵maksymsproductengine
snapshot upload
2013-12-19merge changes from project qa viewerOz Linden
2013-12-19merge addition of LLAgent::removeRegionChangeCallbackOz Linden
2013-12-18STORM-1980: set new region restart sound uuidOz Linden
2013-12-18STORM-1831 Changing addRegionChangedCallback to more closely resemble the ↵Ima Mechanique
feature it replaces. This fixes the crashes reported by Whirly ;-)
2013-12-17add LLAgent::removeRegionChangedCallbackOz Linden
2013-12-17merge changes for open-113Oz Linden
2013-12-17merge changes for 3.6.12-releaseOz Linden