livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
24,994 Commits
2 Branches
0 Tags
301 MiB
Commit Graph

24994 Commits (9cc1dfd4e6f3859e690da578adde057ec9a82e18)

Author SHA1 Message Date
maxim_productengine 9cc1dfd4e6 MAINT-1303 FIXED Hide menus and buttons after exiting mouselook if 'Hide all controls' is switched on. 2012-10-18 18:58:55 +03:00
simon@Simon-PC.lindenlab.com 19f25eea3d merge 2012-10-17 16:44:37 -07:00
simon@Simon-PC.lindenlab.com ab38c854c3 MAINT-1724 : Viewer crashes while attempt to open '+ inventory' floater 
that already opened in separated floater.  Changed to non-tearable menu.
Reviewed by Kelly
 2012-10-17 16:43:56 -07:00
Kelly Washington 9d701e563b MAINT-1742 Child object does not update position while selected. 
reviewed with Davep
 2012-10-17 14:05:14 -07:00
Dave Parks 2e30d65210 Automated merge with https://bitbucket.org/lindenlab/viewer-cat 2012-10-17 15:33:20 -05:00
Dave Parks 378e9528d4 MAINT-873 Fix for inability to upload meshes on some systems. 2012-10-17 15:33:01 -05:00
simon@Simon-PC.lindenlab.com 4d807ba638 Merge in upstream fixes 2012-10-17 12:36:11 -07:00
Dave Parks 161c848e3d MAINT-643 Cleanup some shader compilation errors when atmospheric shaders are enabled. 2012-10-17 13:29:15 -05:00
simon@Simon-PC.lindenlab.com 8c8c2f3b94 Fix angry Linux and Mac builds 2012-10-17 11:28:51 -07:00
Dave Parks b19a5c192f MAINT-1404 Fix for child objects not appearing to move when editing until deselecting. 2012-10-16 17:27:03 -05:00
Dave Parks 12621b9d06 Automated merge with https://bitbucket.org/lindenlab/viewer-cat 2012-10-16 16:25:36 -05:00
Dave Parks ec125540c4 MAINT-643 Fix for incorrect lighting and colors in preview displays. 2012-10-16 16:25:01 -05:00
simon@Simon-PC.lindenlab.com 7f0d6e0377 Pull back viewer-development with latest beta merges 2012-10-16 09:58:31 -07:00
Oz Linden e7a5dc7cda pull back changes from 3.4.1-beta8 2012-10-16 09:36:15 -04:00
Oz Linden a7f6dcaef7 Added tag 3.4.1-beta8 for changeset 1dc94555582f 2012-10-15 23:19:06 -04:00
Oz Linden ab9debd994 tag merge of DRTVWR-228 2012-10-15 23:18:55 -04:00
Kelly Washington ffc33a1cc5 MAINT-1598 Edit Linked Parts isn't returning creator/owner 
* Show creator, owner and group information when only selecting a single prim
  in a linkset.
reviewed with Simon
 2012-10-15 16:46:42 -07:00
simon@Simon-PC.lindenlab.com d6e3b0445a Merge in viewer-development code and fix build 2012-10-15 14:23:29 -07:00
Dave Parks c97730988e MAINT-1721 Fix for crash when clicking "back" button after editing appearance. 
Reviewed by VoidPointer
 2012-10-15 15:59:41 -05:00
Oz Linden 474ea25a5e pull back 3.4.1-beta7 fixes 2012-10-15 16:21:24 -04:00
Dave Parks 9b7bfcf594 MAINT-1568 Fix for inconsistent triangle counts when changing LoD sources in model importer 2012-10-12 17:25:17 -05:00
Oz Linden 5ad21254de Added tag 3.4.1-beta7 for changeset 524da902713e 2012-10-12 17:53:23 -04:00
Oz Linden ede388aeb2 merge changes for DRTVWR-227 2012-10-12 17:51:55 -04:00
Oz Linden d18d3684a8 tag merge of DRTVWR-227 2012-10-12 17:51:49 -04:00
Dave Parks b8f88a535c MAINT-1649 Fix for objects disappearing on region crossing. 2012-10-12 13:18:47 -05:00
William Todd Stinson e1bc3cb096 MAINT-1684: Correcting the calls to ll_aligned_free() which should have actually been to ll_aligned_free_16(). 2012-10-11 18:25:13 -07:00
William Todd Stinson 572d4bc071 MAINT-1684: Attempt at correcting the linux crash on startup. Replacing the memory allocations and frees in the LLPrivateMemoryPool with aligned memory allocations and frees. 2012-10-11 16:47:16 -07:00
Dave Parks 7ebbb5067d MAINT-1709 Factor out realloc 
Reviewed by VoidPointer
 2012-10-11 17:02:45 -05:00
Oz Linden 1709952adb pull back 3.4.1-beta6 fixes 2012-10-10 21:40:10 -04:00
Oz Linden 3f45fa719e Added tag 3.4.1-beta6 for changeset 49ed253c80be 2012-10-10 19:29:14 -04:00
Oz Linden 2a0d7acccf tag merge of DRTVWR-179 2012-10-10 19:15:00 -04:00
Dave Parks 830ecff00b DRTVWR-225 Cleanup assertions 2012-10-10 14:13:52 -05:00
William Todd Stinson 4a3bdb6896 Pull and merge from ssh://hg@bitbucket.org/oz_linden/viewer-beta-drtvwr-179. 2012-10-10 15:10:48 -07:00
Oz Linden 9edd628643 merge changes for DRTVWR-226 2012-10-10 09:16:05 -04:00
Oz Linden bf9eb5cc25 tag merge of DRTVWR-226 2012-10-10 09:16:02 -04:00
Dave Parks 6c989a692d MAINT-1138 Fix for crash when picking rigged attachments. 2012-10-09 18:27:42 -05:00
Dave Parks 827d8814cf MAINT-1688 Potential fix for crash on exit in LLTextureFetch 2012-10-09 13:34:28 -05:00
Oz Linden 04663d0329 Added tag 3.4.1-beta5 for changeset 0bd3744ff060 2012-10-06 06:16:26 -04:00
Oz Linden 66901ca487 tag merge of DRTVWR-224 2012-10-06 06:16:13 -04:00
William Todd Stinson aa86085347 MAINT-1636: Turning off tcmalloc for the build now that davep's changes are in to fix our major crasher. 2012-10-05 15:58:38 -07:00
Oz Linden 7db84aa7e0 Added tag 3.4.1-beta4 for changeset 305950187c62 2012-10-04 20:21:42 -04:00
Oz Linden 07899b2820 merge changes for DRTVWR-222 2012-10-04 20:12:51 -04:00
Oz Linden a5e28651f5 tag merge of DRTVWR-222 2012-10-04 20:12:37 -04:00
Dave Parks ce007b124b Fix for linux build 2012-10-03 16:32:09 -05:00
Dave Parks 6b0fe3258a Fix for mac/linux build 2012-10-03 16:02:22 -05:00
Dave Parks 20e1f567d5 Fix for tests 2012-10-03 15:17:55 -05:00
Dave Parks 374f20edf0 Fix non-thread-safe refcounting of LLHTTPClient::Responder and fix out-of-order deletion of LLTextureFetch on shutdown 2012-10-03 14:30:21 -05:00
Dave Parks 05dbd7dafe Instrument debug builds on windows to help track down source of heap corruption 2012-10-02 16:06:14 -05:00
Oz Linden 7fe8e87d19 Added tag 3.4.1-beta3 for changeset e6e553761829 2012-10-02 15:01:05 -04:00
Oz Linden bc062ac43d tag merge of DRTVWR-221 2012-10-02 15:00:50 -04:00