summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2013-02-21Help the hg stop worrying about comment-only diffsGraham Madarasz (Graham Linden)
2013-02-21Merge viewer-cat and resolve conflict with alternate selfGraham Madarasz (Graham Linden)
2013-02-14Merged lindenlab/viewer-cat into defaultgraham linden
2013-02-14For MAINT-1291 Re-order cubemap disable and shader tex disable to avoid ↵Graham Madarasz (Graham Linden)
false alarm when using RenderDebugGL. Code Review: DaveP
2013-02-14Automated merge with https://bitbucket.org/lindenlab/viewer-catDave Parks
2013-02-14MAINT-2368 Pull in Firestorm fix for textures unloading behind you.Dave Parks
2013-02-13Automated merge with https://bitbucket.org/lindenlab/viewer-catDave Parks
2013-02-13MAINT-2355 Fix for corrupt rigged attachments on Intel HD GraphicsDave Parks
2013-02-12Merge downstream code (viewer-bear, lion and release)simon@Simon-PC.lindenlab.com
2013-02-12Merge downstream code (viewer-lion and viewer-release)simon@Simon-PC.lindenlab.com
2013-02-12Pull and merge viewer-releasesimon@Simon-PC.lindenlab.com
2013-02-11Automated merge with https://bitbucket.org/lindenlab/viewer-catDave Parks
2013-02-11MAINT-2347 Change connect timeout to 30 seconds and request timeout to 4 minutesDave Parks
2013-02-05merge changes for DRTVWR-297Oz Linden
2013-02-04MAINT-2326 - New viewer restart notifications appear when logging in if notsimon@Simon-PC.lindenlab.com
closed before logging out.
2013-02-04MAINT-2323 Fix for crash on shutodwn in mesh responder destructorsDave Parks
2013-02-01STORM-1930 Quality & Speed slider has Ultra label where High should be.Whirly
2013-01-31Fix funky merge problemsimon@Simon-PC.lindenlab.com
2013-01-30Pull in viewer-catsimon@Simon-PC.lindenlab.com
2013-01-30merge downstream code from viewer-lionsimon@Simon-PC.lindenlab.com
2013-01-30Merge in viewer-developmentsimon@Simon-PC.lindenlab.com
2013-01-29pull back more 3.4.5 beta fixesOz Linden
2013-01-29merge changes for MAINT-2276Oz Linden
2013-01-29MAINT-2281: correct test for XP (corrected fix I applied incorrectly)Oz Linden
2013-01-29MAINT-2288 Fix for physics shapes not showing up on "active" objects.Dave Parks
2013-01-28For MAINT-2276 a workaround to unblock 3.4.5 beta review: tedGraham Madarasz (Graham)
2013-01-26[MAINT-2233] Duplicate entries in notifications.xmlChris Baker
- Removed duplicate entry from panel_preferences_general.xml
2013-01-25Automated merge with https://bitbucket.org/lindenlab/viewer-catDave Parks
2013-01-25MAINT-2268 Add right-click->"Mute Particle Owner" featureDave Parks
2013-01-25MAINT-2268 Add right-click->"Mute Particle Owner" featureDave Parks
2013-01-25[MAINT-2233] Duplicate entries in notifications.xmlChris Baker
- Removed duplicate notification elements
2013-01-29MAINT-2281: correct test for XPcallum_linden
2013-01-25merge changes for MAINT-2275, MAINT-2277Oz Linden
2013-01-25merge changes for DRTVWR-290Oz Linden
2013-01-24MAINT-2275 Child prims are "left behind" by animated, moving (physical) linksetsKelly Washington
* A fix that doesn't break tanks. Reverts MAINT-1742
2013-01-24MAINT-2275 Child prims are "left behind" by animated, moving (physical) linksetsKelly Washington
* A fix that doesn't break doors. Reverst MAINT-2247
2013-01-24Automated merge with ssh://bitbucket.org/lindenlab/viewer-developmentNat Goodspeed
2013-01-24MAINT-2277 Yellow "fence" (selection) of the parcel doesn't update after ↵Kelly Washington
selecting the other parcel * Removed bogus check on matching parcel data coming in.
2013-01-24MAINT-2275 Child prims are "left behind" by animated, moving (physical) linksetsKelly Washington
2013-01-22pull back fix for MAINT-2242Oz Linden
2013-01-22MAINT-2158 - Particle grievance. Particles are not added at less than 4 fps.simon@Simon-PC.lindenlab.com
Reviewed by Kelly
2013-01-22merge changes for DRTVWR-287Oz Linden
2013-01-22Automated merge with https://bitbucket.org/lindenlab/viewer-catDave Parks
2013-01-22MAINT-2252 GPU Table updateDave Parks
2013-01-18merge changes for MAINT-2247Oz Linden
2013-01-17MAINT-1514 Viewer crashes while user trying to invite all friends to the groupKelly Washington
* Enforce 100 max invites at the 'add to list' stage instead of only at 'sent to server' * Cache the IDs in the list locally to avoid horrible performance pattern
2013-01-16MAINT-2247 Child object does not update rotation while selected.Kelly Washington
2013-01-16MAINT-2242 Fix for shader compilation errors on Intel HD graphics chips.Dave Parks
2013-01-15merge changes for DRTVWR-284Oz Linden
2013-01-15merge changes for DRTVWR-282Oz Linden