summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2011-08-08correct merge-induced error in settings.xmlOz Linden
2011-08-08merge back beta tagsOz Linden
2011-08-08merge changes for storm-1060Oz Linden
2011-08-05merged .hgtagsDebi King (Dessie)
2011-08-05undo Mac app name change (again)Oz Linden
2011-08-05Merging STORM-565Vadim ProductEngine
2011-08-05undo Mac app name changeOz Linden
2011-08-04storm-1060 : add windows (thanks Kadah and Michelle), remove some files I ↵Oz Linden
think are no longer used
2011-08-04merge changes for storm-1538Oz Linden
2011-08-04merge changes for storm-1355Oz Linden
2011-08-04merge changes for storm-1458Oz Linden
2011-08-04merge changes for storm-1291Oz Linden
2011-08-04fix path choice for project branches, attempt to fix linux iconOz Linden
2011-08-04merge back disabling of watchdogOz Linden
2011-08-04fix license headersOz Linden
2011-08-04fix DOS line endingsOz Linden
2011-08-04storm-1060 (partial) : update icon selection for Mac and Linux buildsOz Linden
2011-08-03Automated merge with file:///Users/oz/Work/V-PROz Linden
2011-08-02merge changes for storm-1535Oz Linden
2011-08-02disable watchdogOz Linden
2011-08-02Pull from richard/viewer-experienceMerov Linden
2011-08-02SH-2202 FIX physics costs have increasedNyx (Neal Orman)
Changed the default to use low LOD for single hull generation, will fall back to medium or high if not present.
2011-08-02Sync with lindenlab/viewer-developmentMerov Linden
2011-08-02pulling latest viewer-development into mesh merge branch.Nyx (Neal Orman)
2011-08-02merged .hgtagsDebi King (Dessie)
2011-08-02STORM-1291 FOLLOWUP Localized common (unisex) gestures.Vadim ProductEngine
2011-08-01SH-2183 Add a debug setting to control whether or not to use multiple ↵Dave Parks
threads in LLCurl
2011-08-01merge changes for storm-1535Oz Linden
2011-07-29Include some certs that were missed in the latest cert update. Specifically,Roxie Linden
paypal had a verisign -2 CA cert, and the new trust list only includes -3. Also, disable use of the system cert store. Just use our list.
2011-07-29EXP-1057 FIX Cursor doesn't go to the input field on the Find Floater due to ↵Richard Linden
lack of window focus also allow right clip to copy url from disabled address bar
2011-07-29SH-2200 Fix for BSOD on 7800 Go on Vista when setting graphics detail to "High"Dave Parks
2011-07-29STORM-1512 Fix for crash when rendering impostors.Dave Parks
2011-07-29EXP-1056 FIX Web popup issues with Web Content BrowserRichard Linden
changed browser id back to a string so it accepts malformed uuid strings coming from webkit - "{uuid}" instead of "uuid"
2011-07-29merge changes for storm-1510Oz Linden
2011-07-29merge changes for late release fixesOz Linden
2011-07-29late fix to set watchdog on at 60 secondsOz Linden
2011-07-29late fix to disable VBO on Macs for performanceOz Linden
2011-07-29reconciled .hgtagsDebi King (Dessie)
2011-07-29merge changes for storm-1451Oz Linden
2011-07-29merge changes for storm-1408Oz Linden
2011-07-29merge changes for storm-1405Oz Linden
2011-07-29merge changes for storm-1529Oz Linden
2011-07-29merge changes for storm-1404Oz Linden
2011-07-29merge changes for storm-1291Oz Linden
2011-07-29merge changes for storm-1233Oz Linden
2011-07-29merge changes for storm-1220Oz Linden
2011-07-29merge changes for storm-1311Oz Linden
2011-07-29Add geotrust CAs for some internal linden machines like teamcity, and moveRoxie Linden
the trust chain around a bit.
2011-07-28EXP-1054 FIX Entering search term in search box in Viewer UI does not ↵Richard Linden
produce search results if search window is already open use new parameters when opening existing floater
2011-07-28update CA's to most current set (taken from the osx lion cert store)Roxie Linden