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

24902 Commits (4db36dfcdca29eefee618cbfe318e9d6fea16c7b)

Author SHA1 Message Date
William Todd Stinson 4db36dfcdc Pull and merge from https://bitbucket.org/lindenlab/viewer-development. 2012-10-18 16:51:23 -07:00
Oz Linden 7021e4b21b change to force new build number 2012-10-16 16:07:25 -04: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
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
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
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
William Todd Stinson 52e306d575 Pull and merge from https://bitbucket.org/lindenlab/viewer-development. 2012-10-11 14:38:28 -07:00
William Todd Stinson 4174e9be5e Adding an additional conversion constructor. 2012-10-11 11:51:16 -07:00
Oz Linden 1709952adb pull back 3.4.1-beta6 fixes 2012-10-10 21:40:10 -04:00
William Todd Stinson 828bfc2ade Attempting to fix an issue where the installed viewer does not run because of a bad command line option. 2012-10-10 17:33:37 -07:00
William Todd Stinson 7b3552e932 Restricting editing of objects through the debug materials floater to the current region only. 2012-10-10 17:10:35 -07: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
William Todd Stinson 0ea99ea01f Adding a setting to allow user to edit the specular color alpha. 2012-10-10 14:07:30 -07: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
William Todd Stinson aae0d21790 Disabling the bad post button until more development can be done. 2012-10-09 18:53:23 -07:00
William Todd Stinson aed6a3c733 Adding a behavior to the multi-tables for the get response to sync up the selected material across all tables. 2012-10-09 18:45:33 -07:00
William Todd Stinson f84f821df7 Adding ability to edit materials per face. 2012-10-09 17:59:46 -07:00
William Todd Stinson 8a8339a9a8 Adding a reset inputs button to the edit tab. 2012-10-09 17:19:24 -07:00
William Todd Stinson 7eea1e2061 Removing legacy code now that the latest server builds have the additional normal and specular map fields. 2012-10-09 16:53:45 -07:00
William Todd Stinson a8642c90da Adjusting the layout and adding functionality to query the viewerable objects with non-null material ids. 2012-10-09 16:30:53 -07:00
William Todd Stinson 9b05e5f35b Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-development-materials. 2012-10-09 12:32:45 -07:00
William Todd Stinson 38a565f71a Initial pass at getting a list of viewer objects with non-null material IDs. 2012-10-09 12:30:38 -07:00
Dave Parks 827d8814cf MAINT-1688 Potential fix for crash on exit in LLTextureFetch 2012-10-09 13:34:28 -05:00
William Todd Stinson 002a54f779 Adding new material fields for the GET method. 2012-10-08 12:05:41 -07: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
William Todd Stinson ddc004c201 Adding the new material settings to the edit values. And an initial re-organization of the groups into tabs. Still a WIP, but somewhat usable. 2012-10-04 19:17:42 -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
William Todd Stinson 93b7f615bc Moving the debug materials floater under the Develop menu and renaming. 2012-10-03 18:42:49 -07:00
William Todd Stinson dbe0a577ae Removing overly verbose debug outputs. 2012-10-03 18:31:33 -07:00
William Todd Stinson dfc75e9414 Renaming the XUI files for floater_stinson to floater_debug_materials. 2012-10-03 18:24:39 -07:00
William Todd Stinson 49db545650 Renaming the LLFloaterStinson class to be LLFloaterDebugMaterials. 2012-10-03 17:37:37 -07: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
William Todd Stinson 8aadd6c529 Renaming the floater stinson files to be floater debug materials. 2012-10-02 16:59:27 -07:00