Commit Graph

29872 Commits (ce5baf14ac62ecd3bf471e1b49a4e166310ebe1a)

Author SHA1 Message Date
Merov Linden ce5baf14ac Pull merge from lindenlab/viewer-release 2013-11-18 16:07:55 -08:00
Merov Linden 125f3f071a MAINT-3319 : WIP : Introduce a consolidate folder method used for Merchant Outbox 2013-11-18 16:03:22 -08:00
Merov Linden 6ec99570cd MAINT-3320 : Fixed! Inventory panels are not resistant to folder root deletion, using handle instead of pointer and cleaning things consistently 2013-11-15 15:12:11 -08:00
Merov Linden 148c3780e1 MAINT-3320 : WIP : Introduced a cleanOutbox() method to be called on outbox deletion 2013-11-13 13:29:51 -08:00
Merov Linden e6b4b89bf1 MAINT-3320 : WIP : Use handle for elements that'll get deleted under us, quite a bit of debug spam to clean later 2013-11-11 18:39:02 -08:00
Oz Linden ebc9bcbf69 convert dos line endings 2013-11-11 15:26:55 -05:00
Oz Linden b8cafb8e85 increment viewer version to 3.6.11 2013-11-11 15:26:19 -05:00
Oz Linden 424e8687e4 Added tag 3.6.10-release for changeset 5b54b36862ff 2013-11-11 15:25:46 -05:00
Dave Parks 9ad67587b7 DRTVWR-338 Make an inocuous change to get a new build number out of TeamCity 2013-11-07 16:18:17 -06:00
Aura Linden 976ad95977 Shot in the dark patch for MAINT-3353 backported from viewer-tiger 2013-11-05 13:01:25 -08:00
maksymsproductengine 71205580d9 MAINT-3376 FIXED Successive llSetTextureAnim calls fail in 3.6.10 (283075) unless a different command (llSleep(0.01), llSay(0,"hello")) is placed between them.:
- fix for MAINT-2861 was reverted to resolve this issue;
2013-11-05 04:23:12 +02:00
Merov Linden 309d16ebdb Pull merge from lindenlab/viewer-fbc 2013-10-28 17:19:14 -07:00
Merov Linden 3a57a67c5d ACME-1099 : Fix crash when getting the Facebook cap from a (potentially null) region 2013-10-28 17:15:57 -07:00
Nat Goodspeed 57040ea70e Automated merge with http://bitbucket.org/nat_linden/viewer-maint-3331 2013-10-28 20:06:18 -04:00
Mnikolenko ProductEngine d5877bc365 MAINT-3343 FIXED Expand/Collapse message pan only on left click. 2013-10-28 14:37:06 +02:00
Nat Goodspeed 8881b47d22 MAINT-3331: On update, remove com.secondlife.indra.viewer.savedState. 2013-10-22 01:35:01 -04:00
Merov Linden 3111cf4ccf Pull merge from viewer-release 2013-10-17 15:22:18 -07:00
Merov Linden be01ac2a36 BUG-4185 : Fix glsl compilation error on Mac 2013-10-17 15:20:34 -07:00
Merov Linden c71d9f13ef Pull merge from lindenlab/viewer-release 2013-10-16 19:15:14 -07:00
oz@lindenlab.com c7057c141c increment viewer version to 3.6.9 2013-10-16 17:16:25 -04:00
oz@lindenlab.com 9ca1358d42 Added tag 3.6.8-release for changeset d40c66e41074 2013-10-16 17:14:18 -04:00
Merov Linden f6c7b906e1 Pull merge with lindenlab/viewer-bear 2013-10-14 17:25:24 -07:00
Merov Linden c2f5365f98 Pull merge from lindenlab/viewer-release 2013-10-14 16:30:08 -07:00
Mnikolenko ProductEngine 04b84ce07d MAINT-3290 FIXED Handle correctly Mouse Capture for LLTextBox. 2013-10-14 14:21:06 +03:00
Mnikolenko ProductEngine dbb67c326f merge 2013-10-14 14:17:54 +03:00
Dave Parks 929311869b MAINT-2968 Transplant cleanup. 2013-10-11 17:10:26 -05:00
Dave Parks 465809711e MAINT-2968 Transplant cleanup. 2013-10-11 17:10:26 -05:00
Dave Parks 0e116741a0 MAINT-2968 Fix for crash on AMD hardware running current drivers. 2013-10-10 18:00:11 -05:00
Dave Parks e43058e764 MAINT-2968 Fix for crash on AMD hardware running current drivers. 2013-10-10 18:00:11 -05:00
Dave Parks 275a9606e8 Automated merge with http://bitbucket.org/lindenlab/viewer-bear 2013-10-11 16:07:03 -05:00
MaximB ProductEngine b7fbcef298 MAINT-3289 (User is not able to open mini inspector by one click on 'i' icon) 2013-10-11 23:06:25 +03:00
Merov Linden 1e32b9dd33 Pull merge of lindenlab/viewer-release 2013-10-04 09:47:26 -07:00
simon e8d9b05a29 Merge downstream code 2013-10-04 09:00:21 -07:00
dmitrykproductengine f8e5ae8006 MAINT-3142 FIXED Hover over highlighting broken in Second Life 3.6.6 (280797) 2013-10-04 14:04:31 +03:00
maxim@mnikolenko e4c43d6bed MAINT-3247 FIXED Check that gfilter is not NULL. 2013-10-04 13:43:45 +03:00
maksymsproductengine 63cc379c72 MAINT-3270 FIXED crash in LLControlCache<unsigned int>::LLControlCache: Control named RenderAutoMuteFunctionsnot found 2013-10-04 02:50:50 +03:00
Oz Linden f7158bc5af increment viewer version to 3.6.8 2013-10-03 18:03:25 -04:00
Oz Linden 272d588168 Added tag 3.6.7-release for changeset ae457ece7700 2013-10-03 18:02:38 -04:00
MaximB ProductEngine f806073646 MAINT-3193 FIXED crash with LLControlCache<bool>::LLControlCache: Control named RenderAutoMuteLoggingnot found. 2013-09-30 11:40:01 +03:00
Graham Madarasz (Graham Linden) 4bc9393240 MAINT-3155 add cocoa equiv for former AppleEventManager shenanigans for SLURL handling 2013-09-26 18:53:12 -07:00
Graham Linden badb8a945d NORSPEC-259 revive fix stomped with materials->bear merge 2013-09-26 09:23:47 -07:00
Graham Linden c56b410bdb BUG-3984 fix broken rendering of particles using blend funcs 2013-09-25 14:08:58 -07:00
Graham Linden 571920c7b4 BUG-3982 add code to subtract the lack of not removing the removal of backfaces for particles (make particles render double-sided again) 2013-09-25 12:29:02 -07:00
Graham Linden 71e986b059 NORSPEC-285 fix merge error with attenuation on alpha masquerading as this norspec from wayback 2013-09-23 14:49:10 -07:00
Graham Linden 29216ac5e7 MAINT-3179 fix bad indexing of position info generating false alarms on range checks, issue with free of data now allocated contig with positions instead, and added copious amounts of llwarns to error return sites so 'invalid element' will be a reason to read the log and not a tease. 2013-09-23 13:43:01 -07:00
Graham Linden 62b3bb9df5 Merge 2013-09-20 16:45:32 -07:00
Graham Linden 2a03e8f9fb MAINT-3172 fix rendering regressions from release mergedown 2013-09-20 16:44:39 -07:00
simon 6d1c45f863 Fix AvatarRenderInfo cap broken in merge, add a new diagnostic log message 2013-09-20 15:26:44 -07:00
Gilbert Gonzales f53b2bd880 ACME-902: Link the '?' button to the proper viewer-help article or articles 2013-09-20 14:11:07 -07:00
Graham Linden 8aadd9d270 NORSPEC-366 fix regression on 10.6.8 Mac only from release to bear merge 2013-09-20 12:10:50 -07:00