Kokua-3.5.1 Change Log

From Kokua Wiki
Jump to: navigation, search

changeset: 27984:ca8a9da6ef66 tag: tip user: Nicky Perian <nickyperian@yahoo.com> date: Tue Apr 23 16:29:46 2013 -0500 summary: Added tag Kokua-3.5.1 for changeset 3fc1dc944f23

changeset: 27983:e6e8e6e33db4 user: Nicky Perian <nickyperian@yahoo.com> date: Tue Apr 23 16:25:21 2013 -0500 summary: Version to 3.5.1.27984

changeset: 27982:2e33c51c8058 parent: 27971:2d9744600f43 parent: 27981:13149a524874 user: Nicky Perian <nickyperian@yahoo.com> date: Tue Apr 23 15:03:14 2013 -0500 summary: Merge to LL viewer-beta tip

changeset: 27981:13149a524874 user: Oz Linden <oz@lindenlab.com> date: Tue Apr 23 12:27:12 2013 -0400 summary: Added tag 3.5.1-beta3 for changeset 65ae89aeb7ea

changeset: 27980:65ae89aeb7ea tag: 3.5.1-beta3 user: Oz Linden <oz@lindenlab.com> date: Tue Apr 23 11:43:14 2013 -0400 summary: tag merge of DRTVWR-314

changeset: 27979:4b7fa963b80e tag: DRTVWR-314 parent: 27978:57307fb6ab9c parent: 27977:8f8ff2b834ed user: Nyx Linden <nyx@lindenlab.com> date: Tue Apr 23 11:29:51 2013 -0400 summary: merging in tags from beta 2

changeset: 27978:57307fb6ab9c parent: 27975:2319904200de user: Nyx Linden <nyx@lindenlab.com> date: Mon Apr 22 19:14:24 2013 -0400 summary: SUN-72 SH-4132 FIX viewer builds cannot write to paths containing special characters.

changeset: 27977:8f8ff2b834ed user: Oz Linden <oz@lindenlab.com> date: Thu Apr 18 13:18:45 2013 -0400 summary: Added tag 3.5.1-beta2 for changeset 9d8726eca785

changeset: 27976:9d8726eca785 tag: 3.5.1-beta2 user: Oz Linden <oz@lindenlab.com> date: Thu Apr 18 11:25:42 2013 -0400 summary: tag merge of DRTVWR-313

changeset: 27975:2319904200de tag: DRTVWR-313 user: Nyx Linden <nyx@lindenlab.com> date: Wed Apr 17 19:20:42 2013 -0400 summary: BUG-2326 MAINT-2596 FIX crash when selecting non-existant user in resident picker

changeset: 27974:9dc7bf63f750 parent: 27973:5f0712280587 parent: 27960:5157cf19a565 user: Nyx Linden <nyx@lindenlab.com> date: Wed Apr 17 18:35:20 2013 -0400 summary: merging with viewer-beta

changeset: 27973:5f0712280587 user: Nyx Linden <nyx@lindenlab.com> date: Wed Apr 17 18:33:39 2013 -0400 summary: SUN-70 MAINT-2597 FIX Crash when trying to edit no-modify objects

changeset: 27972:c96517c75371 parent: 27953:1ada73295ed0 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Wed Apr 17 16:06:27 2013 -0400 summary: SH-4125 FIX - problem was unpredictable ordering of avatar and llviewerregion deletion. Avoid trying to send metrics when we're shutting down and it's too late anyway. Reviewed by Nyx

changeset: 27971:2d9744600f43 user: Nicky Perian <nickyperian@yahoo.com> date: Tue Apr 23 14:37:33 2013 -0500 summary: Backed out changeset: 56acb5a2f1ac Version 3.5.2 advanced to soon

changeset: 27970:73d144f0eddd user: Nicky Perian <nickyperian@yahoo.com> date: Tue Apr 23 14:36:08 2013 -0500 summary: Backed out changeset: f02c8deb2f0b

changeset: 27969:51af8e0d9c98 user: Nicky Perian <nickyperian@yahoo.com> date: Sun Apr 21 18:07:08 2013 -0500 summary: Add disable build contraint selection to disable/enable the viewer

changeset: 27968:d60a6c7df6ab user: Nicky Perian <nickyperian@yahoo.com> date: Tue Apr 16 19:51:35 2013 -0500 summary: [Opensim] Adjust max prim size from 256 to 1024 meters.

changeset: 27967:6c14147eede1 user: Nicky Perian <nickyperian@yahoo.com> date: Sun Apr 14 20:10:54 2013 -0500 summary: Kokua tweaks for Add OSSL/AA syntax highlighting to OpenSim builds

changeset: 27966:d9503791ecb0 user: Cinders <cinder@cinderblocks.biz> date: Thu Dec 13 23:30:24 2012 -0700 summary: Add OSSL/AA syntax highlighting to OpenSim builds

changeset: 27965:f02c8deb2f0b user: Nicky Perian <nickyperian@yahoo.com> date: Sat Apr 13 10:51:09 2013 -0500 summary: Added tag Kokua-3.5.2 for changeset 56acb5a2f1ac

changeset: 27964:56acb5a2f1ac user: Nicky Perian <nickyperian@yahoo.com> date: Sat Apr 13 10:37:10 2013 -0500 summary: Set Version kokua-3.5.2.27963

changeset: 27963:5fb0f746340b user: Nicky Perian <nickyperian@yahoo.com> date: Sat Apr 13 10:40:09 2013 -0500 summary: [Linux] KOKUA-1219 Brand menu as Kokua and change the script permission to

changeset: 27962:571bad2a079a parent: 27957:f51b9cf7dee9 parent: 27961:c085df84186a user: Nicky Perian <nickyperian@yahoo.com> date: Fri Apr 12 21:27:59 2013 -0500 summary: Merge Default viewer-development

changeset: 27961:c085df84186a user: Oz Linden <oz@lindenlab.com> date: Fri Apr 12 12:42:03 2013 -0400 summary: increment version to 3.5.2

changeset: 27960:5157cf19a565 user: Oz Linden <oz@lindenlab.com> date: Fri Apr 12 12:10:36 2013 -0400 summary: Added tag 3.5.1-beta1 for changeset 20cdf370f5c8

changeset: 27959:20cdf370f5c8 tag: 3.5.1-beta1 parent: 27958:4e68ed8361d2 parent: 27954:fc8c50bc74f5 user: Oz Linden <oz@lindenlab.com> date: Fri Apr 12 12:10:24 2013 -0400 summary: pull changes for Sunshine beta

changeset: 27958:4e68ed8361d2 parent: 27445:0ca3910763ce user: Oz Linden <oz@lindenlab.com> date: Fri Apr 12 11:17:33 2013 -0400 summary: Added tag 3.5.1-beta1 for changeset 0ca3910763ce

changeset: 27957:f51b9cf7dee9 user: Nicky Dasmijn date: Sat Mar 02 18:53:08 2013 +0100 summary: older cmake versions cannot handle -1 as 'rest of string' in string(SUBSTRING ...) command. Work around that by calculating the string length ourselves.

changeset: 27956:ab62e897b32d user: Nicky Perian <nickyperian@yahoo.com> date: Sat Apr 06 13:42:21 2013 -0500 summary: Post merge tweaks

changeset: 27955:7ae3e23b9921 parent: 27439:83e64b85795e parent: 27954:fc8c50bc74f5 user: Nicky Perian <nickyperian@yahoo.com> date: Sat Apr 06 08:31:52 2013 -0500 summary: Merge LL viewer-development has server side baking changes

changeset: 27954:fc8c50bc74f5 user: Oz Linden <oz@lindenlab.com> date: Thu Apr 04 16:43:15 2013 -0400 summary: tag merge of DRTVWR-310

changeset: 27953:1ada73295ed0 tag: DRTVWR-310 parent: 27952:d78e72144598 parent: 27445:0ca3910763ce user: Nyx Linden <nyx@lindenlab.com> date: Thu Apr 04 14:26:43 2013 -0400 summary: merge with latest viewer-development

changeset: 27952:d78e72144598 user: Nyx Linden <nyx@lindenlab.com> date: Thu Apr 04 11:38:23 2013 -0400 summary: SH-4059 FIX other's hover parameters affects your avatar's setting

changeset: 27951:143caee9a077 user: Nyx Linden <nyx@lindenlab.com> date: Wed Apr 03 19:04:57 2013 -0400 summary: SH-4051 REVERT teen accounts unable to remove underclothes even when switching outfits

changeset: 27950:9916ba8b90c5 parent: 27949:247eb85282bd parent: 27948:37898750c32e user: Nyx Linden <nyx@lindenlab.com> date: Wed Apr 03 19:00:13 2013 -0400 summary: merge

changeset: 27949:247eb85282bd parent: 27941:3b57015ff623 user: Nyx Linden <nyx@lindenlab.com> date: Wed Apr 03 18:59:50 2013 -0400 summary: SH-4050 FIX camera goes below ground when avatar offset set to 0

changeset: 27948:37898750c32e user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Wed Apr 03 14:58:33 2013 -0400 summary: SH-4058 - log spam reduction initiative.

changeset: 27947:751e78f22bbf user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Wed Apr 03 11:09:23 2013 -0400 summary: SH-3058 WIP - disable debug-level logging for avatar by default

changeset: 27946:423542aceaaa parent: 27945:3815f1f83cb9 parent: 27941:3b57015ff623 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Tue Apr 02 20:42:41 2013 -0400 summary: merge

changeset: 27945:3815f1f83cb9 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Tue Apr 02 20:40:19 2013 -0400 summary: SH-4057 FIX - cleaned up old canUseHTTP logic, now lives in llviewertexture.cpp

changeset: 27944:d853980abafc user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Tue Apr 02 18:02:59 2013 -0400 summary: Removed setCanUseHTTP override in llvoavatar

changeset: 27943:783e3c715b31 parent: 27942:b948f7870862 parent: 27939:ab13fdbcb33b user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Tue Apr 02 17:55:41 2013 -0400 summary: merge

changeset: 27942:b948f7870862 parent: 27924:d98a3597fa48 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Tue Apr 02 17:54:30 2013 -0400 summary: SH-4057 FIX - host bake textures should start with UDP fetching now, instead of waiting to fail down

changeset: 27941:3b57015ff623 parent: 27940:0c815b39dcae parent: 27939:ab13fdbcb33b user: Nyx Linden <nyx@lindenlab.com> date: Tue Apr 02 18:33:26 2013 -0400 summary: merge

changeset: 27940:0c815b39dcae parent: 27926:8ff78d908290 user: Nyx Linden <nyx@lindenlab.com> date: Tue Apr 02 18:32:57 2013 -0400 summary: BUILDFIX commit policy fixes

changeset: 27939:ab13fdbcb33b parent: 27938:abd6dafdf067 parent: 27926:8ff78d908290 user: prep@lindenlab.com date: Tue Apr 02 17:27:20 2013 -0500 summary: merge

changeset: 27938:abd6dafdf067 parent: 27924:d98a3597fa48 parent: 27937:40319899512b user: prep@lindenlab.com date: Tue Apr 02 17:15:48 2013 -0500 summary: Merged in chui beta code.

changeset: 27937:40319899512b user: AlexanderP ProductEngine <apaschenko@productengine.com> date: Tue Apr 02 18:56:52 2013 +0300 summary: CHUI-811 FIXED [CHUIBUG]Too much spacing around the new chat UI elements

changeset: 27936:3231df3e0e59 user: AlexanderP ProductEngine <apaschenko@productengine.com> date: Mon Apr 01 19:40:40 2013 +0300 summary: CHUI-896 : ADD FIX : Line flashing and FUI button flashing not working correctly for CHUI notifications

changeset: 27935:b5c9c622bc77 parent: 27934:57e9a42ead10 parent: 27933:069fee7c54fe user: Gilbert Gonzales <gilbert@lindenlab.com> date: Mon Apr 01 17:12:47 2013 -0700 summary: merge

changeset: 27934:57e9a42ead10 parent: 27931:27e113e8f044 user: Gilbert Gonzales <gilbert@lindenlab.com> date: Mon Apr 01 15:36:05 2013 -0700 summary: CHUI-796 (User doesn't get all messages in 'do not disturb' mode): Now when a conversation is focused by clicking on it's line item, selecting a torn off floater or unminimized a torn off floater the stored notifications for that conversation will be removed.

changeset: 27933:069fee7c54fe user: Merov Linden <merov@lindenlab.com> date: Mon Apr 01 13:39:14 2013 -0700 summary: CHUI-907 : Fixed! Suppress inexistant menu item and duplicated registrar entry to avoid warning

changeset: 27932:88bdbb4f3aa9 user: Merov Linden <merov@lindenlab.com> date: Mon Apr 01 13:04:24 2013 -0700 summary: CHUI-907 : Prevent warning when parsing menus adding name to menu_item_check

changeset: 27931:27e113e8f044 user: Mnikolenko ProductEngine <mnikolenko@productengine.com> date: Mon Apr 01 20:09:37 2013 +0300 summary: CHUI-904 FIXED Set the focus on the Nearby chat floater after setting visibility.

changeset: 27930:4d612a4b84cd parent: 27929:c940d31ded00 parent: 27928:ea6ef5ce05bc user: mberezhnoy <mberezhnoy@productengine.com> date: Mon Apr 01 20:06:23 2013 +0300 summary: merge

changeset: 27929:c940d31ded00 parent: 27404:f044701bda47 user: mberezhnoy <mberezhnoy@productengine.com> date: Mon Apr 01 08:53:44 2013 +0300 summary: CHUI-886 (Time in front of the name is not displayed when the Conversations size is reduced to a minimum.)

changeset: 27928:ea6ef5ce05bc user: Merov Linden <merov@lindenlab.com> date: Fri Mar 29 17:40:16 2013 -0700 summary: CHUI-807 : Trace add and remove sessions

changeset: 27927:47379db12d56 parent: 27432:902caf2b9fdb user: Merov Linden <merov@lindenlab.com> date: Fri Mar 29 17:22:53 2013 -0700 summary: CHUI-807 : Add more defensive coding. Also trace in log the sessions created so we'll have a better idea of what people do with conversations if we see that crash again.

changeset: 27926:8ff78d908290 user: Nyx Linden <nyx@lindenlab.com> date: Tue Apr 02 12:51:45 2013 -0400 summary: SH-4051 FIX problem with teen account and undershirt layers

changeset: 27925:e2e6631cf59d user: Nyx Linden <nyx@lindenlab.com> date: Tue Apr 02 12:46:41 2013 -0400 summary: SH-4044 FIX voice dot is offset vertically if using avatar height offset

changeset: 27924:d98a3597fa48 parent: 27923:265702daa33f parent: 27922:2cd1ff1b6f56 user: Nyx Linden <nyx@lindenlab.com> date: Fri Mar 29 18:06:05 2013 -0400 summary: merge

changeset: 27923:265702daa33f parent: 27919:84999108d994 user: Nyx Linden <nyx@lindenlab.com> date: Fri Mar 29 18:05:36 2013 -0400 summary: SUN-57 SH-4039 FIX bake fail on non-ssb regions

changeset: 27922:2cd1ff1b6f56 parent: 27921:e4ae7f3dc05c parent: 27432:902caf2b9fdb user: prep@lindenlab.com date: Fri Mar 29 13:22:51 2013 -0500 summary: Another Chui beta6+ merge to deal with build issues

changeset: 27921:e4ae7f3dc05c parent: 27920:666ba6c1d8f4 parent: 27430:d4985146d167 user: prep@lindenlab.com date: Fri Mar 29 10:37:58 2013 -0500 summary: Merged in Chui beta6+ fixes

changeset: 27920:666ba6c1d8f4 user: prep <prep@lindenlab.com> date: Thu Mar 28 11:43:12 2013 -0400 summary: sh-4014: Don't send appearance updates while editing.

changeset: 27919:84999108d994 user: Nyx Linden <nyx@lindenlab.com> date: Mon Mar 25 18:29:01 2013 -0400 summary: SH-4034 FIX Outfit changes broadcast without exiting appearance edit mode

changeset: 27918:3116282adb62 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Fri Mar 22 13:55:39 2013 -0400 summary: SH-3850 WIP - fixed some warnings

changeset: 27917:77d35ff6750a user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Fri Mar 22 13:48:27 2013 -0400 summary: SH-3850 WIP - added some additional debugging output to try to catch gray textures

changeset: 27916:36cfc39f57c3 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Fri Mar 22 12:24:31 2013 -0400 summary: Disabled QAModeMetrics by default, prior to general release

changeset: 27915:f3c68ce0fb7d user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Fri Mar 22 12:21:24 2013 -0400 summary: SH-4001 FIX - made local texture loading universal.

changeset: 27914:add53a385e38 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Fri Mar 22 12:17:06 2013 -0400 summary: Moved LastUpdateCOF stuff to avatar, so we can track last received for non-self avs

changeset: 27913:84e17554588c parent: 27912:032744ee57a5 parent: 27370:910b5fad950e user: prep@lindenlab.com date: Wed Mar 20 17:53:51 2013 -0500 summary: Merge with viewer-chui

changeset: 27912:032744ee57a5 parent: 27911:13c88cd54fa5 parent: 27910:1cd1086a7dad user: Nyx Linden <nyx@lindenlab.com> date: Wed Mar 20 12:04:55 2013 -0400 summary: merge

changeset: 27911:13c88cd54fa5 parent: 27897:3e6b32e9e5af user: Nyx Linden <nyx@lindenlab.com> date: Wed Mar 20 12:04:26 2013 -0400 summary: SH-3978 FIX Unsaved changes/save options not shown after adding new pants.

changeset: 27910:1cd1086a7dad user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Wed Mar 20 11:43:34 2013 -0400 summary: Removed avatar stuff from asset metrics, again. Must have gotten broken in a merge at some point.

changeset: 27909:6d812582e0cf user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Tue Mar 19 09:34:58 2013 -0400 summary: still more build failure fixing

changeset: 27908:608515821176 parent: 27907:8d5045b5fabb parent: 27906:84a2ee9dba74 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Mon Mar 18 18:45:08 2013 -0400 summary: merge

changeset: 27907:8d5045b5fabb parent: 27904:9ace8f45d645 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Mon Mar 18 18:44:21 2013 -0400 summary: SH-3980 FIX - fixed most cases of server-bake blurring by disabling caching of server bakes. A better solution is desirable, may not be for initial release

changeset: 27906:84a2ee9dba74 parent: 27905:3fd62a912f87 parent: 27904:9ace8f45d645 user: prep <prep@lindenlab.com> date: Mon Mar 18 18:11:28 2013 -0400 summary: merge

changeset: 27905:3fd62a912f87 parent: 27896:72f93acbb024 user: prep <prep@lindenlab.com> date: Mon Mar 18 18:10:40 2013 -0400 summary: Fix for sh-4014. This was a regression caused by fix for sh-3650.

changeset: 27904:9ace8f45d645 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Mon Mar 18 17:00:48 2013 -0400 summary: Fix for build error

changeset: 27903:e1865a709cde user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Mon Mar 18 16:41:42 2013 -0400 summary: more urgent notification (DEBUG->WARN) for some texture fetch error cases

changeset: 27902:bcf1159c9621 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Mon Mar 18 13:38:13 2013 -0400 summary: cut back log spam

changeset: 27901:b12bef95f298 parent: 27899:f652a47573c0 parent: 27900:f51f8acafdce user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Mon Mar 18 11:46:12 2013 -0400 summary: merge

changeset: 27900:f51f8acafdce parent: 27896:72f93acbb024 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Fri Mar 15 13:26:31 2013 -0400 summary: SH-3850 WIP, SH-3959 WIP - added additional debug logging for texture loading

changeset: 27899:f652a47573c0 parent: 27898:de8ff7a341c0 parent: 27897:3e6b32e9e5af user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Mon Mar 18 11:39:21 2013 -0400 summary: merge

changeset: 27898:de8ff7a341c0 parent: 27888:4b9487d71d70 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Wed Mar 13 17:21:26 2013 -0400 summary: SH-3975 WIP - consolidated texture fetch state changes to simplify tracking

changeset: 27897:3e6b32e9e5af user: Nyx Linden <nyx@lindenlab.com> date: Mon Mar 18 11:36:37 2013 -0400 summary: BUILDFIX new appearance utility src for fixing a runtime error

changeset: 27896:72f93acbb024 user: prep <prep@lindenlab.com> date: Thu Mar 14 14:43:11 2013 -0400 summary: modified_cof_cb() issues a updateAppearanceFromCOF() right before this function - removed extra update call. Sh-3650 & Sh-3985

changeset: 27895:945ea119716c user: Nyx Linden <nyx@lindenlab.com> date: Wed Mar 13 17:52:40 2013 -0400 summary: SH-3806 FIX test case for local bakes being wrong

changeset: 27894:962c999d1cc9 user: Don Kjer <don@lindenlab.com> date: Wed Mar 13 21:01:50 2013 +0000 summary: More fixes for gcc-4.6 breakage

changeset: 27893:d735db7942a9 user: Don Kjer <don@lindenlab.com> date: Wed Mar 13 19:17:13 2013 +0000 summary: Fix for gcc 4.6 build failures on Linux in llwindowsdl.cpp

changeset: 27892:fbd24d6b81a5 user: prep <prep@lindenlab.com> date: Wed Mar 13 15:01:27 2013 -0400 summary: Fixed unit test compile error

changeset: 27891:bd3a34184a90 parent: 27889:e5edef45614f parent: 27890:83135d6d0d49 user: prep <prep@lindenlab.com> date: Wed Mar 13 13:40:36 2013 -0400 summary: merge

changeset: 27890:83135d6d0d49 parent: 27888:4b9487d71d70 user: prep <prep@lindenlab.com> date: Wed Mar 13 13:36:45 2013 -0400 summary: Ported sunshine-internal fixes (Commits: 5271cc5 and b37c09)

changeset: 27889:e5edef45614f user: Nyx Linden <nyx@lindenlab.com> date: Tue Mar 12 22:34:15 2013 +0000 summary: SH-3944 WIP CHUI merge fixing

changeset: 27888:4b9487d71d70 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Wed Mar 13 11:19:21 2013 -0400 summary: fix for build failure

changeset: 27887:f26c19edc9f0 user: Don Kjer <don@lindenlab.com> date: Wed Mar 13 08:49:26 2013 +0000 summary: Fixed potential memory leak in LLHTTPClient. Fixed potential hanging http requests in LLHTTPClient. Fixed munging of "Pragma" headers in LLHTTPClientAdapter

changeset: 27886:c5cb007bc83c user: prep linden <prep@lindenlab.com> date: Tue Mar 12 11:02:00 2013 -0400 summary: Removed unneeded code.

changeset: 27885:3a7b2af9fd0d user: prep <prep@lindenlab.com> date: Mon Mar 11 18:15:40 2013 -0400 summary: #include fix

changeset: 27884:ebba992b86f6 user: prep <prep@lindenlab.com> date: Mon Mar 11 18:02:16 2013 -0400 summary: llinventory merge fixes

changeset: 27883:bda1d0ea7c8e user: prep <prep@lindenlab.com> date: Mon Mar 11 17:29:05 2013 -0400 summary: LLWindow merge fixes for Mac

changeset: 27882:b5f441d6b1ac parent: 27278:3ccb7839fc56 parent: 27881:b893ce47a04c user: prep <prep@lindenlab.com> date: Mon Mar 11 15:17:13 2013 -0400 summary: merge

changeset: 27881:b893ce47a04c parent: 27879:61124f8f8473 parent: 27880:c2100ee419b7 user: prep <prep@lindenlab.com> date: Mon Mar 11 15:05:47 2013 -0400 summary: merge

changeset: 27880:c2100ee419b7 parent: 27291:6449c9284592 parent: 27871:dcd79bbd15dd user: prep <prep@lindenlab.com> date: Mon Mar 11 14:45:53 2013 -0400 summary: Viewer-chui merge

changeset: 27879:61124f8f8473 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Mon Mar 11 14:58:55 2013 -0400 summary: more test build fix

changeset: 27878:91463962223e user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Mon Mar 11 14:51:45 2013 -0400 summary: Added gratuitous coupling to stop gcc from complaining

changeset: 27877:ced3fa2e8619 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Mon Mar 11 13:52:29 2013 -0400 summary: Fix for build failure in tests

changeset: 27876:d1489fedfb77 parent: 27875:61fc9c268ddb parent: 27874:2d52b4ed58d8 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Mon Mar 11 07:37:03 2013 -0400 summary: merge

changeset: 27875:61fc9c268ddb parent: 27873:546e3867f9e1 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Fri Mar 08 17:07:17 2013 -0500 summary: SH-3959 WIP - pass information about type of fetched image - server bake, host bake, map tile, etc - down the chain so LLTextureFetchWorker can adjust behavior as needed

changeset: 27874:2d52b4ed58d8 user: Nyx Linden <nyx@lindenlab.com> date: Fri Mar 08 18:45:33 2013 -0500 summary: SH-3941 SH-3954 FIX local appearance does not update properly

changeset: 27873:546e3867f9e1 parent: 27872:9022a7af4ba5 parent: 27871:dcd79bbd15dd user: Nyx Linden <nyx@lindenlab.com> date: Wed Mar 06 17:21:21 2013 -0500 summary: merge

changeset: 27872:9022a7af4ba5 parent: 27861:bd42e861fa41 user: Nyx Linden <nyx@lindenlab.com> date: Wed Mar 06 17:20:33 2013 -0500 summary: SH-3954 SH-3941 SH-3910 FIX local appearance does not update

changeset: 27871:dcd79bbd15dd user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Wed Mar 06 10:46:43 2013 -0500 summary: Fix for windows build failure

changeset: 27870:2a8f7b1fb689 parent: 27869:a999d018122c parent: 27868:beb01c7b789d user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Wed Mar 06 09:53:57 2013 -0500 summary: merge

changeset: 27869:a999d018122c parent: 27863:1f9fd8428e38 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Wed Mar 06 09:53:11 2013 -0500 summary: make it clearer when DebugForceAppearanceRequestFailure is on

changeset: 27868:beb01c7b789d user: Don Kjer <don@lindenlab.com> date: Tue Mar 05 22:05:22 2013 -0800 summary: Fixing issues with not detecting when LLSD XML parsing fails. Changing most http error handlers to understand LLSD error responses. Fleshing out most http error handler message spam.

changeset: 27867:8adef812c4a9 user: Don Kjer <don@lindenlab.com> date: Tue Mar 05 11:28:06 2013 -0800 summary: Adding debug setting to allow overriding appearance service url

changeset: 27866:7c7f8dfd644d parent: 27865:ff5c81cfce96 parent: 27864:2e977d3e900a user: Don Kjer <don@lindenlab.com> date: Mon Mar 04 12:02:28 2013 -0800 summary: Automated merge

changeset: 27865:ff5c81cfce96 parent: 27863:1f9fd8428e38 user: Don Kjer <don@lindenlab.com> date: Mon Mar 04 12:02:02 2013 -0800 summary: Reducing amount of cof link data sent to appearance update service. Allowing links to items with 'null' asset ids to be passed

changeset: 27864:2e977d3e900a user: prep <prep@lindenlab.com> date: Mon Mar 04 13:14:35 2013 -0500 summary: Removed deprecated calls to incrementCofVersion

changeset: 27863:1f9fd8428e38 user: Don Kjer <don@lindenlab.com> date: Mon Mar 04 01:09:45 2013 -0800 summary: Adding md5sum calculation to experimental server appearance update message

changeset: 27862:8a83916c4e93 user: Don Kjer <don@lindenlab.com> date: Sun Mar 03 23:32:48 2013 -0800 summary: Adding DebugAvatarExperimentalServerAppearanceUpdate setting to test sending full cof contents

changeset: 27861:bd42e861fa41 parent: 27860:a5ca41d9b8cc parent: 27859:f885291d9ab8 user: Nyx Linden <nyx@lindenlab.com> date: Fri Mar 01 19:40:06 2013 -0500 summary: merge

changeset: 27860:a5ca41d9b8cc parent: 27854:c431af3e0cac user: Nyx Linden <nyx@lindenlab.com> date: Fri Mar 01 19:39:47 2013 -0500 summary: SH-3649 WIP newly created pants do not show up on mac/windows.

changeset: 27859:f885291d9ab8 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Fri Mar 01 13:50:21 2013 -0500 summary: Periodic log messages to explain why user is still clouded, if they are

changeset: 27858:230637f9ff30 parent: 27857:3f36ea398201 parent: 27856:735d42fdf969 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Fri Mar 01 10:38:22 2013 -0500 summary: merge

changeset: 27857:3f36ea398201 parent: 27850:2209e734a6c2 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Fri Mar 01 09:06:40 2013 -0500 summary: SH-3860 WIP - fixes the cloud on initial login, still have a COF version rae condition due to creation of the base outfit link

changeset: 27856:735d42fdf969 parent: 27855:68bd4d2b95db parent: 27854:c431af3e0cac user: Nyx Linden <nyx@lindenlab.com> date: Thu Feb 28 23:34:59 2013 +0000 summary: merge

changeset: 27855:68bd4d2b95db parent: 27817:b554ba544259 user: Nyx Linden <nyx@lindenlab.com> date: Thu Feb 28 23:32:00 2013 +0000 summary: SH-3798 FIX avatar skins look dull

changeset: 27854:c431af3e0cac parent: 27853:108ae1ed56ea parent: 27852:7da970eb9d2c user: Nyx Linden <nyx@lindenlab.com> date: Thu Feb 28 17:26:14 2013 -0500 summary: merge

changeset: 27853:108ae1ed56ea parent: 27818:8c2e432ec85c user: Nyx Linden <nyx@lindenlab.com> date: Thu Feb 28 17:25:37 2013 -0500 summary: SH-3909 Support avatar height offset

changeset: 27852:7da970eb9d2c parent: 27851:f7b9ec6bc2c4 parent: 27850:2209e734a6c2 user: prep <prep@lindenlab.com> date: Thu Feb 28 16:23:18 2013 -0500 summary: merge

changeset: 27851:f7b9ec6bc2c4 parent: 27849:d7f4d920bf2f user: prep <prep@lindenlab.com> date: Thu Feb 28 16:22:27 2013 -0500 summary: WIP: Removed caching of responder id. Code to dump the new and old seed caps when we receive multiple seedcaps for a region.

changeset: 27850:2209e734a6c2 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Thu Feb 28 15:58:56 2013 -0500 summary: SH-3932 FIX - added LLSD blob for viewer-side cof contents, optionally included with request appearance update

changeset: 27849:d7f4d920bf2f user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Thu Feb 28 14:53:53 2013 -0500 summary: SH-3899 WIP

changeset: 27848:eff03e5c6fff parent: 27847:01e3f599c082 parent: 27843:dcd8453e3126 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Thu Feb 28 13:56:52 2013 -0500 summary: merge

changeset: 27847:01e3f599c082 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Thu Feb 28 11:47:14 2013 -0500 summary: SH-3899 WIP - detailed logging of cof mismatch errors

changeset: 27846:fb8a9eb06ca8 parent: 27839:c10ee25f7066 parent: 27845:ff71b14b79b4 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Thu Feb 28 08:40:28 2013 -0500 summary: merge

changeset: 27845:ff71b14b79b4 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Wed Feb 27 17:58:43 2013 -0500 summary: SH-3860 WIP - fixes for initial COF loading and config

changeset: 27844:a2a12e7b395c parent: 27825:a2ef83e11e83 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Wed Feb 27 15:17:31 2013 -0500 summary: Increase number of retries for requestServerAppearanceUpdate()

changeset: 27843:dcd8453e3126 user: prep <prep@lindenlab.com> date: Thu Feb 28 13:40:36 2013 -0500 summary: Bug fix# we don't want to be incrementing the responderid in the base responder

changeset: 27842:c6fd4ec47096 user: prep <prep@lindenlab.com> date: Thu Feb 28 11:19:19 2013 -0500 summary: Renamed seedcap tracker class

changeset: 27841:a031777bbbea parent: 27840:f76bea33abc8 parent: 27839:c10ee25f7066 user: prep <prep@lindenlab.com> date: Thu Feb 28 11:13:38 2013 -0500 summary: merge

changeset: 27840:f76bea33abc8 parent: 27815:238c4e8bfdd7 user: prep <prep@lindenlab.com> date: Thu Feb 28 10:56:12 2013 -0500 summary: SH-3895. Added code to recognize if the second incoming regions seed caps differ in size from the initial region caps. Also avoid starting a inventory fetch responder if the requisite cap is missing"

changeset: 27839:c10ee25f7066 parent: 27826:0480b64271ed parent: 27838:03d51247430d user: Richard Linden date: Wed Feb 27 11:19:17 2013 -0800 summary: Automated merge with https://bitbucket.org/lindenlab/sunshine-internal

changeset: 27838:03d51247430d user: Richard Linden date: Thu Feb 21 16:50:11 2013 -0800 summary: SH-3864 FIX Closing the Inventory window exits outfit editing.

changeset: 27837:0043def77234 user: Logan Dethrow <log@lindenlab.com> date: Tue Jan 15 17:43:16 2013 -0500 summary: Fixed spelling error.

changeset: 27836:c853773838bc parent: 27835:b8e92471c455 parent: 27718:c65861c7d8fd user: Logan Dethrow <log@lindenlab.com> date: Thu Dec 13 18:35:07 2012 -0500 summary: Merged SH-3339 work with sunshine-internal. Still a WIP.

changeset: 27835:b8e92471c455 user: Logan Dethrow <log@lindenlab.com> date: Thu Dec 13 18:07:50 2012 -0500 summary: WIP SH-3339. Commit to merge from trunk to get build fixes, etc.

changeset: 27834:62f1e99f0595 user: Logan Dethrow <log@lindenlab.com> date: Mon Nov 19 16:56:03 2012 -0500 summary: Removed a few unnecessary include lines.

changeset: 27833:b92be9a74561 user: Logan Dethrow <log@lindenlab.com> date: Mon Nov 19 16:49:00 2012 -0500 summary: Restored part of indra/cmake/Variables.cmake that somehow got removed.

changeset: 27832:4dd101c226f7 user: Logan Dethrow <log@lindenlab.com> date: Mon Nov 19 16:30:14 2012 -0500 summary: Moved implementation of incrementCofVersion to llappearancemgr.cpp. Changed retry logic to use the more robust mRetryPolicy instead of my own previous implementation.

changeset: 27831:01522e8e6e2e parent: 27830:4bdb065291ad parent: 27676:3bc189d0a1b1 user: Logan Dethrow <log@lindenlab.com> date: Mon Nov 19 14:28:10 2012 -0500 summary: Merge.

changeset: 27830:4bdb065291ad user: Logan Dethrow <log@lindenlab.com> date: Mon Nov 19 14:26:59 2012 -0500 summary: WIP SH-3339 Only try to increment the cof version if in a server bake region.

changeset: 27829:02ee503b1257 user: Logan Dethrow <log@lindenlab.com> date: Fri Nov 16 17:07:45 2012 -0500 summary: WIP First buildable code after adding support for SH-3339.

changeset: 27828:b239c916c0e9 parent: 27827:982d0193f48e parent: 27673:b83be07a98f1 user: Logan Dethrow <log@lindenlab.com> date: Thu Nov 15 15:20:46 2012 -0500 summary: Merge lindenlab/sunshine-internal -> log/sunshine-internal

changeset: 27827:982d0193f48e parent: 27643:5106e7f30209 user: Logan Dethrow <log@lindenlab.com> date: Thu Nov 15 15:20:05 2012 -0500 summary: WIP Working on adding http request to increment the COF version when a change is made to an item in an agent's current outfit folder. SH-3339

changeset: 27826:0480b64271ed user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Wed Feb 27 11:59:44 2013 -0500 summary: Fix for mac build failure this time for sure

changeset: 27825:a2ef83e11e83 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Wed Feb 27 11:55:08 2013 -0500 summary: Fix for mac build failure

changeset: 27824:286de7ebb021 parent: 27823:047b7edc3838 parent: 27818:8c2e432ec85c user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Wed Feb 27 11:43:02 2013 -0500 summary: merge

changeset: 27823:047b7edc3838 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Wed Feb 27 11:38:12 2013 -0500 summary: SH-3899 WIP - more verbose logging of appearance request status, debug option to force failures for testing

changeset: 27822:d383db4e4e60 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Tue Feb 26 22:00:50 2013 -0500 summary: SH-3899 WIP - more logging of appearance message info

changeset: 27821:948dd0062d7c user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Tue Feb 26 07:45:50 2013 -0500 summary: cleaned up old message

changeset: 27820:c9e5b186a6d9 parent: 27819:657fedd7a8ba parent: 27817:b554ba544259 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Mon Feb 25 19:14:45 2013 -0500 summary: merge

changeset: 27819:657fedd7a8ba parent: 27815:238c4e8bfdd7 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Mon Feb 25 19:12:36 2013 -0500 summary: SH-3860 WIP, SH-3899 WIP - make folder version management more debuggable, log appearance request results

changeset: 27818:8c2e432ec85c user: Nyx Linden <nyx@lindenlab.com> date: Tue Feb 26 15:29:23 2013 -0500 summary: BUILDFIX fixing undefined reference in build

changeset: 27817:b554ba544259 parent: 27816:332db722d064 parent: 27815:238c4e8bfdd7 user: Nyx Linden <nyx@lindenlab.com> date: Mon Feb 25 18:19:28 2013 -0500 summary: merge

changeset: 27816:332db722d064 parent: 27814:496e85012df5 user: Nyx Linden <nyx@lindenlab.com> date: Mon Feb 25 18:19:08 2013 -0500 summary: SH-3892 SH-3896 SUN-28 FIX add to outfit behaves like replace outfit

changeset: 27815:238c4e8bfdd7 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Wed Feb 20 13:24:58 2013 -0500 summary: SH-3891 WIP - separate first-time rezzing stats from subsequent state changes

changeset: 27814:496e85012df5 parent: 27811:12971463b155 parent: 27813:e7314f097197 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Wed Feb 20 11:10:41 2013 -0500 summary: merge

changeset: 27813:e7314f097197 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Tue Feb 19 10:09:38 2013 -0500 summary: SH-3792 WIP - changed local texture loading to be consistent with viewer_development - this fixes the gray head issue. There is still some remaining issue with bakes not uploading at full resolution, probably due to a bad image asset.

changeset: 27812:350d7ec230cd parent: 27809:3fd83e5d0f0c user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Fri Feb 15 13:44:21 2013 -0500 summary: additional safety check for bad appearance messages

changeset: 27811:12971463b155 user: Don Kjer <don@lindenlab.com> date: Tue Feb 19 23:05:31 2013 +0000 summary: Updating appearance utility

changeset: 27810:a6d25a78483d user: Don Kjer <don@lindenlab.com> date: Fri Feb 15 21:30:56 2013 +0000 summary: Fix to allow horde bots to render other avatars in the area

changeset: 27809:3fd83e5d0f0c user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Fri Feb 15 09:52:11 2013 -0500 summary: SH-3867 FIX - on logout, wait for any pending metrics uploads to complete

changeset: 27808:32e53de2b559 parent: 27805:87a6fc812214 parent: 27807:6da93ca9d9c5 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Fri Feb 15 07:59:24 2013 -0500 summary: merge

changeset: 27807:6da93ca9d9c5 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Thu Feb 14 17:52:50 2013 -0500 summary: tweaked and added some log messages, including more detail when an image is flagged as missing

changeset: 27806:37aa72d69a35 parent: 27803:9be0d0e78b58 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Thu Feb 14 13:46:24 2013 -0500 summary: removed some no-op code, enhanced display of DebugAvatarAppearanceMessage status line

changeset: 27805:87a6fc812214 parent: 27804:2e136f132af5 parent: 27803:9be0d0e78b58 user: Nyx Linden <nyx@lindenlab.com> date: Thu Feb 14 13:42:09 2013 -0500 summary: merge

changeset: 27804:2e136f132af5 parent: 27797:bd937889c07f user: Nyx Linden <nyx@lindenlab.com> date: Thu Feb 14 13:41:36 2013 -0500 summary: SH-3803 FIX Missing Wearable reported in sunshine viewer

changeset: 27803:9be0d0e78b58 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Wed Feb 13 18:37:15 2013 -0500 summary: SH-3852 WIP - send non-complete timers only on av destruction or last message, so they don't get multiply counted

changeset: 27802:25c65e1430c6 parent: 27801:0d9c75098588 parent: 27798:41d27e0fd48a user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Wed Feb 13 17:30:00 2013 -0500 summary: merge

changeset: 27801:0d9c75098588 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Wed Feb 13 17:28:05 2013 -0500 summary: SH-3812 WIP, SH-3852 WIP - some metrics cleanup, added rebake when needed and sb system is unavailable, to avoid stale appearance problems

changeset: 27800:08be5f29a4a4 parent: 27797:bd937889c07f parent: 27799:57200ab14d2a user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Wed Feb 13 10:21:33 2013 -0500 summary: merge

changeset: 27799:57200ab14d2a parent: 27795:9595426e709f user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Wed Feb 13 07:47:24 2013 -0500 summary: SH-3852 WIP - modified metrics for update_appearance_from_cof and wear_inventory_category, end when bakes are fully loaded

changeset: 27798:41d27e0fd48a parent: 27797:bd937889c07f parent: 25930:a49c715243a3 user: prep <prep@lindenlab.com> date: Wed Feb 13 11:30:36 2013 -0500 summary: Merge from viewer-beta

changeset: 27797:bd937889c07f parent: 27796:b84e0ad227f5 parent: 27795:9595426e709f user: Nyx Linden <nyx@lindenlab.com> date: Tue Feb 12 18:37:23 2013 -0500 summary: merge

changeset: 27796:b84e0ad227f5 parent: 27794:a95cd25d667a user: Nyx Linden <nyx@lindenlab.com> date: Tue Feb 12 18:37:01 2013 -0500 summary: SH-3859 FIX adding or removing clothing in appearance edit mode are visible

changeset: 27795:9595426e709f user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Tue Feb 12 17:59:00 2013 -0500 summary: SH-3852 WIP - removed agent_id from summary packets

changeset: 27794:a95cd25d667a user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Tue Feb 12 16:49:50 2013 -0500 summary: removed some redundant or deprecated timers

changeset: 27793:2292e4dc34a4 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Tue Feb 12 14:26:48 2013 -0500 summary: SH-2852 WIP - track avatar loading via load_<foo> timers, added distinction between partially and fully loaded textures

changeset: 27792:67d0ea5fa6a2 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Tue Feb 12 10:58:04 2013 -0500 summary: SH-3852 WIP - added more specific logging of completenesss of texture loading

changeset: 27791:030725ad19e5 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Mon Feb 11 16:43:23 2013 -0500 summary: fix for build failure on test w/linux

changeset: 27790:45db0d3183c1 parent: 27789:7992551cb66a parent: 27788:4fe3ad76934c user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Mon Feb 11 15:10:30 2013 -0500 summary: merge

changeset: 27789:7992551cb66a parent: 27787:c125fabd38f6 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Mon Feb 11 15:09:53 2013 -0500 summary: fix for mac build failure

changeset: 27788:4fe3ad76934c user: Don Kjer <don@lindenlab.com> date: Mon Feb 11 19:52:07 2013 +0000 summary: Updating appearance util

changeset: 27787:c125fabd38f6 parent: 27786:eecc8a8233e3 parent: 27782:6cb6633fc417 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Mon Feb 11 13:51:08 2013 -0500 summary: merge

changeset: 27786:eecc8a8233e3 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Mon Feb 11 13:50:26 2013 -0500 summary: SH-3852 WIP - removed avatar metrics from ViewerAssetMetrics

changeset: 27785:db82cfde2a70 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Fri Feb 08 15:51:01 2013 -0500 summary: SH-3852 WIP - bucketize stats by agent_id, grid coordinates and various other criteria

changeset: 27784:9412eafdf3f1 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Thu Feb 07 19:14:00 2013 -0500 summary: SH-3852 WIP - track per-timer stats

changeset: 27783:e863852bd64c parent: 27777:37ef2c46e26a user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Thu Feb 07 11:14:37 2013 -0500 summary: SH-3852 WIP - small tweaks

changeset: 27782:6cb6633fc417 user: Don Kjer <don@lindenlab.com> date: Sat Feb 09 01:18:36 2013 +0000 summary: Updating appearance utility

changeset: 27781:1485ab1712e2 parent: 27780:377239880a13 parent: 27779:898950428696 user: Don Kjer <don@lindenlab.com> date: Sat Feb 09 00:44:41 2013 +0000 summary: Automated merge

changeset: 27780:377239880a13 parent: 27777:37ef2c46e26a user: Don Kjer <don@lindenlab.com> date: Sat Feb 09 00:43:56 2013 +0000 summary: Updating appearance utility

changeset: 27779:898950428696 parent: 27778:52d1245ef522 parent: 27777:37ef2c46e26a user: Nyx Linden <nyx@lindenlab.com date: Wed Feb 06 18:38:43 2013 -0500 summary: merge

changeset: 27778:52d1245ef522 parent: 27767:3d5b26f20ebd user: Nyx Linden <nyx@lindenlab.com date: Wed Feb 06 18:38:17 2013 -0500 summary: SH-3651 FIX Beard edits not applying on server bakes

changeset: 27777:37ef2c46e26a user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Fri Feb 01 17:22:50 2013 -0500 summary: SH-3800 WIP - additional log line

changeset: 27776:53534490ed35 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Fri Feb 01 17:21:59 2013 -0500 summary: SH-3800 WIP - additional log line

changeset: 27775:cae344950f98 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Fri Feb 01 16:14:37 2013 -0500 summary: SH-3800 WIP - fixed bad case in appearance version computation

changeset: 27774:5b4cab21297c user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Fri Feb 01 10:53:02 2013 -0500 summary: SH-3800 WIP - log some of sent appearance msg info as well as received

changeset: 27773:ae1b3a2baa2e user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Fri Feb 01 09:13:31 2013 -0500 summary: SH-3800 WIP - reject appearance messages with contradictory appearance version info

changeset: 27772:ae204280fca2 parent: 27771:50f7b07a1c88 parent: 27767:3d5b26f20ebd user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Thu Jan 31 11:38:57 2013 -0500 summary: merge

changeset: 27771:50f7b07a1c88 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Wed Jan 30 18:43:30 2013 -0500 summary: SH-3800 WIP - avoid complaints about source of various standard textures - IMG_DEFAULT_AVATAR etc

changeset: 27770:cd1bdcff46ce user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Wed Jan 30 18:23:31 2013 -0500 summary: SH-3800 WIP - logic to detect baked textures being sought in the wrong place, avoid querying textures for which we have no authoritative data where they live

changeset: 27769:a5a62209ead4 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Wed Jan 30 13:56:05 2013 -0500 summary: SH-3800 WIP - flag mismatched expectations for baked texture origins

changeset: 27768:9a452a210a56 parent: 27764:66f3829e6e56 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Wed Jan 30 10:14:16 2013 -0500 summary: SH-3780 WIP - more checking on appearance param values

changeset: 27767:3d5b26f20ebd parent: 27766:ffc3a98f9639 parent: 27765:29d091f9bbe1 user: Nyx Linden <nyx@lindenlab.com> date: Wed Jan 30 17:36:13 2013 -0500 summary: merge

changeset: 27766:ffc3a98f9639 parent: 27756:d5c7d3f16024 user: Nyx Linden <nyx@lindenlab.com> date: Wed Jan 30 17:35:36 2013 -0500 summary: SH-3651 FIX Beards not visible on server-generated appearances.

changeset: 27765:29d091f9bbe1 user: prep@lindenlab.com date: Tue Jan 29 14:53:00 2013 -0600 summary: SH3530: Removed extra ServerAppearanceUpdate()

changeset: 27764:66f3829e6e56 parent: 27756:d5c7d3f16024 parent: 27763:dcedc1fdb49a user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Mon Jan 28 17:42:26 2013 -0500 summary: merge

changeset: 27763:dcedc1fdb49a user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Mon Jan 28 13:47:00 2013 -0500 summary: SH-3779 WIP, SH-3534 WIP - more bake-status tracking

changeset: 27762:59422dd55fcc user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Fri Jan 25 09:31:20 2013 -0500 summary: SH-3779 WIP - less verbose appearance dumps, keep appearance version visual param in sync with mUseServerBakes

changeset: 27761:06ee23e73576 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Thu Jan 24 17:28:15 2013 -0500 summary: SH-3779 WIP - handling of appearance version param

changeset: 27760:09ea873f9dd8 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Wed Jan 23 18:31:21 2013 -0500 summary: SH-3779 WIP - fully parse appearance message before trying to do anything with it

changeset: 27759:8c2d3df9cc7e user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Wed Jan 23 16:04:08 2013 -0500 summary: SH-3534 WIP - better encapsulation of mUseServerBakes

changeset: 27758:54b2b205a062 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Wed Jan 23 11:04:23 2013 -0500 summary: fixes and updates to DebugAvatarAppearanceMessage status line

changeset: 27757:dec95fa054bc parent: 27754:84c1a2f08703 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Tue Jan 22 21:47:35 2013 -0500 summary: Added cof version information to DebugAvatarAppearanceMessage output

changeset: 27756:d5c7d3f16024 user: Nyx Linden <nyx@lindenlab.com> date: Fri Jan 25 17:58:11 2013 -0500 summary: BUILDFIX: merge cleanup

changeset: 27755:c0fe25b89fea parent: 25902:927561892775 parent: 27754:84c1a2f08703 user: Nyx Linden <nyx@lindenlab.com> date: Thu Jan 24 16:22:49 2013 -0500 summary: merging in viewer-beta.

changeset: 27754:84c1a2f08703 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Tue Jan 22 09:19:23 2013 -0500 summary: Add debug level logging for Avatar by default. Will need to turn this off before general release, but will give us better debugging info during testing

changeset: 27753:2cc9003fdadc user: Don Kjer <don@lindenlab.com> date: Sat Jan 19 02:00:39 2013 +0000 summary: Adding stub for private artifacts

changeset: 27752:1ba55af0fa5b parent: 27751:790fd7b62715 parent: 27750:33d26479b4ad user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Fri Jan 18 16:53:25 2013 -0500 summary: merge

changeset: 27751:790fd7b62715 parent: 27749:ea021d3bcabe user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Fri Jan 18 16:51:03 2013 -0500 summary: SH-3344 WIP - more texture load monitoring

changeset: 27750:33d26479b4ad user: Don Kjer <don@lindenlab.com> date: Fri Jan 18 21:22:18 2013 +0000 summary: Moving appearance utility deb to private repo

changeset: 27749:ea021d3bcabe parent: 27748:b8ea9f0efdcc parent: 27746:36fa93403185 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Wed Jan 16 14:48:19 2013 -0500 summary: merge

changeset: 27748:b8ea9f0efdcc user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Wed Jan 16 11:34:42 2013 -0500 summary: SH-3645 WIP - preserve item order after wearable save as

changeset: 27747:bdc2923b71c8 parent: 27745:9a950b52d375 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Tue Jan 15 20:30:20 2013 -0500 summary: SH-3339 WIP, SH-3645 WIP - added getActualDescription to obviate an obnoxious and widely-used workaround, re-create COF link after wearable edit to force COF version bump

changeset: 27746:36fa93403185 user: prep <prep@lindenlab.com> date: Mon Jan 14 17:21:13 2013 -0500 summary: SH-3632:Undo change is now disabled after you save and return to the edit out fit panel (this behavior is now make sunshine-internal consistent with 3.4.1)

changeset: 27745:9a950b52d375 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Mon Jan 14 16:02:28 2013 -0500 summary: removed yet another logcontrol.xml commit

changeset: 27744:8042e5e56298 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Fri Jan 11 11:36:11 2013 -0500 summary: SH-3639 WIP - cleaned up some diagnostics and added fault injection ability. Disabled inventory retries for now.

changeset: 27743:8bcc4e69e802 parent: 27741:acf01350248d parent: 27742:71461a236f71 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Fri Jan 11 11:22:24 2013 -0500 summary: merge

changeset: 27742:71461a236f71 parent: 27738:ca4ad4aa92ea parent: 27731:86c73cb5fdfb user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Tue Jan 08 08:55:30 2013 -0500 summary: merge

changeset: 27741:acf01350248d parent: 27740:d3a5d0165144 parent: 27735:cd14e2534abf user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Thu Jan 10 13:24:18 2013 -0500 summary: merge

changeset: 27740:d3a5d0165144 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Thu Jan 10 13:22:48 2013 -0500 summary: SH-3639 WIP - increased retry interval to allow for intermittent extremely slow responses

changeset: 27739:d151c6d45d96 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Mon Jan 07 18:31:28 2013 -0500 summary: SH-3344 WIP - keep avatar local textures flagged no-delete while in use

changeset: 27738:ca4ad4aa92ea parent: 27737:7f7c0a042016 parent: 27736:af8cf01acdc9 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Fri Dec 21 09:07:08 2012 -0500 summary: merge

changeset: 27737:7f7c0a042016 parent: 27727:da1955aabcff user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Tue Dec 18 13:07:01 2012 -0500 summary: SH-3604 WIP - more frequent polling for retries

changeset: 27736:af8cf01acdc9 parent: 27726:ed63659f9187 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Thu Dec 20 10:27:18 2012 -0500 summary: SH-3344 WIP - additional debugging output for avatar local textures

changeset: 27735:cd14e2534abf user: prep <prep@lindenlab.com> date: Thu Jan 10 11:26:05 2013 -0500 summary: SH-3142: Added a debug option that circumvents the precache delay when teleporting.

changeset: 27734:eb38de3eec78 user: prep <prep@lindenlab.com> date: Wed Jan 09 15:43:09 2013 -0500 summary: SH-3600. Undo change is disabled upon reentry into the appearance panel

changeset: 27733:3d4d0edf246c parent: 27732:9db42df26c0b parent: 27731:86c73cb5fdfb user: prep <prep@lindenlab.com> date: Wed Jan 09 12:43:53 2013 -0500 summary: merge

changeset: 27732:9db42df26c0b parent: 27729:585a3607434f user: prep <prep@lindenlab.com> date: Wed Jan 09 12:41:51 2013 -0500 summary: SH-3620: Fix for editing a nocopy wearable being removed from the outfit

changeset: 27731:86c73cb5fdfb user: Don Kjer <don@lindenlab.com> date: Thu Dec 20 21:39:33 2012 +0000 summary: Disabling build of headless appearance utility

changeset: 27730:484c64f54670 user: Don Kjer <don@lindenlab.com> date: Thu Dec 20 21:33:30 2012 +0000 summary: Skipping rendering of unneeded morph masks

changeset: 27729:585a3607434f parent: 27728:2e5fe4eb3135 parent: 27727:da1955aabcff user: Don Kjer <don@lindenlab.com> date: Tue Dec 18 23:40:51 2012 +0000 summary: Automated merge

changeset: 27728:2e5fe4eb3135 parent: 27722:f030f9c2dd68 user: Don Kjer <don@lindenlab.com> date: Tue Dec 18 23:40:31 2012 +0000 summary: Fix for alpha blending using gl fixed-functions not matching shader implementation

changeset: 27727:da1955aabcff user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Tue Dec 18 12:45:10 2012 -0500 summary: SH-3604 WIP - fixed a case with retry logic

changeset: 27726:ed63659f9187 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Mon Dec 17 18:34:13 2012 -0500 summary: SH-3629 WIP - avoid clobbering links to desired items that are already in the COF, as will be the case when wearing an outfit with required body parts missing

changeset: 27725:7a3fa124f7f1 parent: 27724:24bfadf6038e parent: 27722:f030f9c2dd68 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Mon Dec 17 16:51:57 2012 -0500 summary: merge

changeset: 27724:24bfadf6038e user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Mon Dec 17 16:51:25 2012 -0500 summary: SH-3629 WIP - fixed out-of-order outfit items

changeset: 27723:fa5f282315d4 parent: 27716:8812f8c57998 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Mon Dec 17 13:24:57 2012 -0500 summary: SH-3604 FIX - resolved an issue with simulated failures/retry logic

changeset: 27722:f030f9c2dd68 parent: 27718:c65861c7d8fd parent: 27721:ecba41df5ccd user: Don Kjer <don@lindenlab.com> date: Fri Dec 14 22:20:35 2012 +0000 summary: Automated merge

changeset: 27721:ecba41df5ccd user: Don Kjer <don@lindenlab.com> date: Fri Dec 14 20:23:52 2012 +0000 summary: Reverting back to 32-bit colordepth requirement on linux

changeset: 27720:88b0cd090e06 user: Don Kjer <don@lindenlab.com> date: Fri Dec 14 20:11:45 2012 +0000 summary: Updating shaders to not crash when compiled in llvm

changeset: 27719:154b8b1ede96 parent: 25577:7b0d9576e16b user: Don Kjer <don@lindenlab.com> date: Fri Dec 14 01:24:32 2012 +0000 summary: Attempt at fixing linux shader support on ubuntu 12.04

changeset: 27718:c65861c7d8fd user: prep@lindenlab.com date: Thu Dec 13 16:53:38 2012 -0600 summary: Fix for SH-3591.

changeset: 27717:bd1162cb6fbe user: Don Kjer <don@lindenlab.com> date: Wed Dec 12 20:58:56 2012 +0000 summary: Updating appearance utility to deal with IMG_INVISIBLE

changeset: 27716:8812f8c57998 parent: 27715:333486ed60af parent: 27713:24f1d5895738 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Wed Dec 12 15:33:39 2012 -0500 summary: merge

changeset: 27715:333486ed60af user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Wed Dec 12 15:32:31 2012 -0500 summary: SH-3604 WIP - fixed a failure when base outfit link did not need to be created

changeset: 27714:85dde4943a78 parent: 27711:4bc8b277a8be user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Wed Dec 12 12:06:24 2012 -0500 summary: Fix for problem found with changing to an outfit with missing shape

changeset: 27713:24f1d5895738 user: prep <prep@lindenlab.com> date: Wed Dec 12 10:32:42 2012 -0500 summary: Fixes for SH-3591 & SH-3620

changeset: 27712:c8a1a56ad11d user: Don Kjer <don@lindenlab.com> date: Wed Dec 12 00:34:40 2012 +0000 summary: Updating linux libGLOD to match darwin naming

changeset: 27711:4bc8b277a8be parent: 27710:d3a9a2a38473 parent: 27709:54a88b1ea22c user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Tue Dec 11 18:22:41 2012 -0500 summary: merge

changeset: 27710:d3a9a2a38473 parent: 27706:6f81b2d193d5 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Tue Dec 11 18:21:09 2012 -0500 summary: SH-3604 WIP - added base outfit link creation to retryable copy/link operations. Resolves race condition with cof version and server texture bakes

changeset: 27709:54a88b1ea22c parent: 27707:985557f444fb parent: 27708:6ce573b690b6 user: Logan Dethrow <log@lindenlab.com> date: Tue Dec 11 17:14:24 2012 -0500 summary: Automated merge with ssh://bitbucket.org/lindenlab/sunshine-internal

changeset: 27708:6ce573b690b6 parent: 25577:7b0d9576e16b parent: 27706:6f81b2d193d5 user: Logan Dethrow <log@lindenlab.com> date: Tue Dec 11 16:38:10 2012 -0500 summary: Automated merge with ssh://bitbucket.org/lindenlab/viewer-development

changeset: 27707:985557f444fb user: Don Kjer <don@lindenlab.com> date: Tue Dec 11 13:56:50 2012 -0800 summary: Fix for building on case-sensitive mac filesystems. Fix to remove unwind spam warnings while linking on xcode 4.5.2 builds

changeset: 27706:6f81b2d193d5 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Mon Dec 10 15:32:42 2012 -0500 summary: SH-3606 WIP - fixed bug found by persnickety compiler

changeset: 27705:72f75b6e1723 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Mon Dec 10 14:55:09 2012 -0500 summary: removed inadvertent commit of logcontrol.xml

changeset: 27704:8c9d196cdfa1 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Mon Dec 10 14:47:17 2012 -0500 summary: SH-3606 WIP - replaced several LLInventoryCallback subclasses with boost::func equivalents

changeset: 27703:8d66f2370589 parent: 27701:9dbadb59493b parent: 27702:acbbb4709aae user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Mon Dec 10 11:49:36 2012 -0500 summary: merge

changeset: 27702:acbbb4709aae parent: 27696:48ab7cef16ca user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Fri Dec 07 13:57:44 2012 -0500 summary: SH-3606 WIP - moving classes to more reusable location

changeset: 27701:9dbadb59493b user: Logan Dethrow <log@lindenlab.com> date: Fri Dec 07 16:56:10 2012 -0500 summary: Restored test_llcorehttp_peer.py, hopefully breaking the 'hg copy' link that was causing changesets intended for its copy parent to be applied to the child file.

changeset: 27700:6500cf03d836 user: Logan Dethrow <log@lindenlab.com> date: Fri Dec 07 15:47:52 2012 -0500 summary: Deleting test_llcorehttp_peer.py because it has been corrupted by changes to test_llsdmessage_peer.py, which it was copied from. The file will be recreated using an unchanged file.

changeset: 27699:f5f9e740be3a parent: 27698:c1aaa01b8c6e parent: 27697:8c7b673703aa user: Don Kjer <don@lindenlab.com> date: Thu Dec 06 22:56:21 2012 +0000 summary: Automated merge

changeset: 27698:c1aaa01b8c6e parent: 27679:391b384451d1 user: Don Kjer <don@lindenlab.com> date: Thu Dec 06 22:54:50 2012 +0000 summary: Alpha rendering fixes for appearance utility.

changeset: 27697:8c7b673703aa user: Logan Dethrow <log@lindenlab.com> date: Thu Dec 06 21:59:54 2012 +0000 summary: On Linux now use the default system python instead of defaulting to python2.5. This was a holdover from when on linden systems 2.5 was newer than the default, instead of older.

changeset: 27696:48ab7cef16ca user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Thu Dec 06 15:17:00 2012 -0500 summary: SH-3604 FIX - switched link creation in updateCOF() to use retry path, better stats reporting, fixed failure logic

changeset: 27695:91455f8183f6 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Wed Dec 05 18:04:33 2012 -0500 summary: removed yet another unintended commit of logcontrol.xml

changeset: 27694:c7777acd84e8 parent: 27693:f52e16295bf0 parent: 27692:78d91c3312fb user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Wed Dec 05 17:59:26 2012 -0500 summary: merge

changeset: 27693:f52e16295bf0 parent: 27690:9cf7643e2c61 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Wed Dec 05 17:58:35 2012 -0500 summary: Possible fix for TC build failure

changeset: 27692:78d91c3312fb parent: 27691:c15e1fa2412f parent: 27690:9cf7643e2c61 user: Logan Dethrow <log@lindenlab.com> date: Wed Dec 05 17:32:13 2012 -0500 summary: Merge.

changeset: 27691:c15e1fa2412f parent: 27686:a191f757cd43 user: Logan Dethrow <log@lindenlab.com> date: Wed Dec 05 17:29:52 2012 -0500 summary: Linux Viewer build fixes.

changeset: 27690:9cf7643e2c61 parent: 27689:3df90d01a331 parent: 27686:a191f757cd43 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Wed Dec 05 16:40:39 2012 -0500 summary: merge

changeset: 27689:3df90d01a331 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Wed Dec 05 16:39:23 2012 -0500 summary: SH-3604 WIP - backed out logcontrol.xml change

changeset: 27688:d006b8c9d5ef user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Wed Dec 05 16:38:21 2012 -0500 summary: SH-3604 WIP - retry mechanism for batch inventory ops, handle either completion or failure

changeset: 27687:a8742cf4a7ed parent: 27684:1c47277bfdd3 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Tue Dec 04 17:45:01 2012 -0500 summary: SH-3604 WIP

changeset: 27686:a191f757cd43 user: prep <prep@lindenlab.com> date: Wed Dec 05 14:33:30 2012 -0500 summary: Added back in mesa package for linux builds

changeset: 27685:a53939242c52 parent: 27684:1c47277bfdd3 parent: 25562:5b37c3f36be3 user: prep <prep@lindenlab.com> date: Wed Dec 05 12:43:35 2012 -0500 summary: Pull from viewer-development

changeset: 27684:1c47277bfdd3 parent: 27683:9e534c0b3ff3 parent: 27680:3d3931e78cd5 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Mon Dec 03 14:35:45 2012 -0500 summary: merge

changeset: 27683:9e534c0b3ff3 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Mon Dec 03 14:34:00 2012 -0500 summary: SH-3562 WIP

changeset: 27682:a2bd4b1d9d74 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Fri Nov 30 17:41:07 2012 -0500 summary: SH-3562 WIP - detect possible hangs in item copying

changeset: 27681:47505d7bf88b parent: 27676:3bc189d0a1b1 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Thu Nov 29 11:06:10 2012 -0500 summary: fix for possible crash on exit in self_av_string()

changeset: 27680:3d3931e78cd5 user: prep@lindenlab.com date: Fri Nov 30 16:59:15 2012 -0600 summary: SH-3594: Fix for crash when outfits are changed on a non server based baking region.

changeset: 27679:391b384451d1 parent: 27678:5481a416e905 parent: 27677:3bbfafd9e1ac user: Don Kjer <don@lindenlab.com> date: Wed Nov 28 23:46:06 2012 +0000 summary: Automated merge

changeset: 27678:5481a416e905 parent: 27669:dca56a5478b8 user: Don Kjer <don@lindenlab.com> date: Wed Nov 28 23:45:23 2012 +0000 summary: Updating appearance utility

changeset: 27677:3bbfafd9e1ac parent: 27676:3bc189d0a1b1 parent: 25559:8d6dc6efe606 user: prep <prep@lindenlab.com> date: Wed Nov 28 16:36:34 2012 -0500 summary: SH-3563. Pull and merge from viewer-development. Modest code changes to fix alignment issue in llAppearance.

changeset: 27676:3bc189d0a1b1 parent: 27675:f0528bdb6d0c parent: 27674:f2f8c1bf3f1b user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Mon Nov 19 13:50:48 2012 -0500 summary: merge

changeset: 27675:f0528bdb6d0c parent: 27673:b83be07a98f1 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Thu Nov 15 13:54:22 2012 -0500 summary: removed param location from archetype dump - not currently used

changeset: 27674:f2f8c1bf3f1b user: prep@lindenlab.com date: Mon Nov 19 11:27:16 2012 -0600 summary: Implementation for SH-3530, CR:Nyx

changeset: 27673:b83be07a98f1 parent: 27672:748633bdaae7 parent: 27669:dca56a5478b8 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Thu Nov 15 11:15:09 2012 -0500 summary: merge

changeset: 27672:748633bdaae7 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Thu Nov 15 11:13:45 2012 -0500 summary: SH-3484 WIP, SH-3546 WIP, SH-3541 WIP - restrict useBakedTexture when in local update, minor readability tweaks

changeset: 27671:5aa994e22787 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Wed Nov 14 18:30:14 2012 -0500 summary: block appearance messages while editing

changeset: 27670:521239e21e50 parent: 27667:2f6fa311d671 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Wed Nov 14 14:50:05 2012 -0500 summary: SH-3541 WIP - prioritize local textures when in local appearance

changeset: 27669:dca56a5478b8 user: Don Kjer <don@lindenlab.com> date: Thu Nov 15 00:18:16 2012 +0000 summary: Bumping appearance utility source

changeset: 27668:5c66b1674081 user: Nyx Linden <nyx@lindenlab.com> date: Wed Nov 14 22:52:54 2012 +0000 summary: Updating appearance utility package

changeset: 27667:2f6fa311d671 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Wed Nov 14 13:54:48 2012 -0500 summary: Fix for build failures

changeset: 27666:a62ec1ba4bf3 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Wed Nov 14 13:09:54 2012 -0500 summary: SH-3541 WIP - fixed one cause of local textures failing to load

changeset: 27665:228fe5adbab9 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Fri Nov 09 17:44:50 2012 -0500 summary: SH-3484 WIP - added additional logging under DebugAvatarCompositeBaked to try to track down baked texture issues

changeset: 27664:306bceeee2c4 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Thu Nov 08 11:25:41 2012 -0500 summary: removed references to two nonexistent textures in textures.xml

changeset: 27663:068d32e2ad2d user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Wed Nov 07 18:54:20 2012 -0500 summary: Fixed a temp file deletion problem found by inspection of SL log file

changeset: 27662:daa6c7c2a910 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Wed Nov 07 17:12:09 2012 -0500 summary: SH-3493 FIX - removed a large number of completely unnecessary image cache clears, each of which then forced re-reading the same data from disk

changeset: 27661:d1bd6aa406a8 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Wed Nov 07 15:28:38 2012 -0500 summary: SH-3500 FIX - added additional logging to allow params in various locations to be distinguished

changeset: 27660:ece64e709d5d user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Wed Nov 07 10:51:51 2012 -0500 summary: SH-3500 FIX - removed an overzealous warning message

changeset: 27659:7e96814cc4e0 parent: 27658:5328f637580b parent: 27657:3c08ec5aa826 user: Nyx (Neal Orman) <nyx@lindenlab.com> date: Tue Nov 06 18:18:27 2012 -0500 summary: merge

changeset: 27658:5328f637580b parent: 27653:cf8fc977f781 user: Nyx (Neal Orman) <nyx@lindenlab.com> date: Tue Nov 06 18:18:12 2012 -0500 summary: updating appearance utility package

changeset: 27657:3c08ec5aa826 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Mon Nov 05 18:02:03 2012 -0500 summary: renamed a confusingly-named field

changeset: 27656:14d31feb6c5f user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Mon Nov 05 17:36:56 2012 -0500 summary: small logging tweak

changeset: 27655:bcbee41f7218 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Fri Nov 02 18:07:07 2012 -0400 summary: SH-3429 WIP - Added adaptive retry mechanism for failed appearance update requests

changeset: 27654:534af2516548 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Thu Nov 01 14:19:00 2012 -0400 summary: misc error detection, debug coloration for avatar meshes

changeset: 27653:cf8fc977f781 parent: 27652:f6558636ae7e parent: 27651:8fc12874b176 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Tue Oct 30 15:31:13 2012 -0400 summary: merge

changeset: 27652:f6558636ae7e parent: 27650:008ca186fddb user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Fri Oct 26 18:27:08 2012 -0400 summary: SH-3469 FIX - use callback mechanism to handle possible race between getting caps and setting agent region

changeset: 27651:8fc12874b176 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Mon Oct 29 18:05:50 2012 -0400 summary: Fix for general graphical glitching on some cards

changeset: 27650:008ca186fddb parent: 27649:3cc775b6495f parent: 27647:982bff67eeff user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Thu Oct 25 16:44:57 2012 -0400 summary: merge

changeset: 27649:3cc775b6495f user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Thu Oct 25 16:44:01 2012 -0400 summary: SH-3469 FIX - discard new-style updates for self with cof version = 0. This removes a race condition that was causing us to mis-handle region crossing logic

changeset: 27648:5eedad96f988 parent: 27646:5427f1c32e0a user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Wed Oct 24 13:29:59 2012 -0400 summary: SH-3430 FIX - don't cache ids of images with specified URLs, such as server bakes

changeset: 27647:982bff67eeff user: Don Kjer <don@lindenlab.com> date: Wed Oct 24 18:19:22 2012 +0000 summary: Switching to system osmesa library instead of pre-packaged library

changeset: 27646:5427f1c32e0a parent: 27645:a53c650e03f6 parent: 27644:d4139364e943 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Mon Oct 22 11:10:37 2012 -0400 summary: merge

changeset: 27645:a53c650e03f6 parent: 27639:d739cc80a82a user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Mon Oct 22 11:09:32 2012 -0400 summary: handling for crossing from non-server-bake to server-bake regions

changeset: 27644:d4139364e943 user: Nyx Linden <nyx@lindenlab.com> date: Fri Oct 19 21:49:26 2012 +0000 summary: FIX: fixed broken baked texture rendering in lltexlayer, by enforcing correct gl state in lltexlayer.cpp

changeset: 27643:5106e7f30209 parent: 27641:b75823eb1427 parent: 27642:a43a82e3fdf9 user: Nyx (Neal Orman) <nyx@lindenlab.com> date: Thu Oct 18 15:00:12 2012 -0400 summary: Automated merge with https://bitbucket.org/lindenlab/sunshine-internal

changeset: 27642:a43a82e3fdf9 parent: 27634:98ad87467844 user: Nyx (Neal Orman) <nyx@lindenlab.com> date: Thu Oct 18 15:00:05 2012 -0400 summary: Setting alpha rejection settings properly for texture bakes without basic shaders enabled

changeset: 27641:b75823eb1427 parent: 27640:1b9cd5cbf633 parent: 27639:d739cc80a82a user: Don Kjer <don@lindenlab.com> date: Wed Oct 17 23:12:52 2012 +0000 summary: automated merge

changeset: 27640:1b9cd5cbf633 parent: 27635:0cb3ec5e8d62 user: Don Kjer <don@lindenlab.com> date: Wed Oct 17 23:11:40 2012 +0000 summary: Fix for headless appearance utility not linking correctly

changeset: 27639:d739cc80a82a user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Wed Oct 17 18:32:26 2012 -0400 summary: additional diagnostics, improved shape stability at cost of increasing entanglement between baked and local appearance

changeset: 27638:063d0638d81c user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Wed Oct 17 13:43:19 2012 -0400 summary: more param location logging, added wearable type info to dumpArchetypeXML

changeset: 27637:e3e56015ab27 parent: 27635:0cb3ec5e8d62 parent: 27636:e332522f551b user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Tue Oct 16 09:42:46 2012 -0400 summary: merge

changeset: 27636:e332522f551b parent: 27634:98ad87467844 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Mon Oct 15 18:41:55 2012 -0400 summary: additional debugging info, including tracking where visual params live

changeset: 27635:0cb3ec5e8d62 user: Don Kjer <don@lindenlab.com> date: Mon Oct 15 17:36:51 2012 +0000 summary: Speeding up cmake configuration, especially on linux. Re-arranged llrender/llwindow cmake source a bit

changeset: 27634:98ad87467844 user: Don Kjer <don@lindenlab.com> date: Sat Oct 13 02:56:36 2012 +0000 summary: Adding libdl to OSMesa16 link line

changeset: 27633:c7b152ffe3d7 user: Don Kjer <don@lindenlab.com> date: Sat Oct 13 01:39:41 2012 +0000 summary: Pulling in viewer-gcc4.6 freetype fixes

changeset: 27632:46ca6b3623b5 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Fri Oct 12 15:05:56 2012 -0400 summary: Fix for 'no text in release builds' problem

changeset: 27631:0e86f02a4667 user: Don Kjer <don@lindenlab.com> date: Thu Oct 11 20:10:11 2012 +0000 summary: Adding multi-arch hints to CMake, allowing it to correctly find libraries on multi-arch debian-based systems.

changeset: 27630:74b1ff3dac80 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Thu Oct 11 13:29:36 2012 -0400 summary: Fixes for build issues, missing LLCOMMON_SYSTEM_INCLUDE_DIRS in some libraries

changeset: 27629:75002918f891 user: Don Kjer <don@lindenlab.com> date: Thu Oct 11 01:00:31 2012 +0000 summary: Fix for release build in gcc 4.6

changeset: 27628:ebfa0942ed96 user: Don Kjer <don@lindenlab.com> date: Thu Oct 11 00:09:04 2012 +0000 summary: Updating linux build to gcc4.6

changeset: 27627:e3fbd002dd41 user: Don Kjer <don@lindenlab.com> date: Sat Oct 06 08:08:52 2012 +0000 summary: Added fast timers for baked texture rendering. Updated appearance utility

changeset: 27626:664d9900448f user: Don Kjer <don@lindenlab.com> date: Thu Oct 04 22:00:24 2012 +0000 summary: Updating to newer build of tcmalloc/google perf tools. Removing X11 library dependencies from headless libraries

changeset: 27625:bb255b2305f7 user: Don Kjer <don@lindenlab.com> date: Thu Oct 04 20:11:33 2012 +0000 summary: Turning on mHasShaderObjects for mesa headless

changeset: 27624:9e1bd2a4eeb1 user: Don Kjer <don@lindenlab.com> date: Thu Oct 04 08:27:13 2012 +0000 summary: Limiting headless builds to linux

changeset: 27623:407f481e49b9 user: Don Kjer <don@lindenlab.com> date: Thu Oct 04 07:22:52 2012 +0000 summary: Fixing autobuild md5sum for mesa

changeset: 27622:b64e41986082 user: Don Kjer <don@lindenlab.com> date: Thu Oct 04 06:33:41 2012 +0000 summary: Updating appearance utility

changeset: 27621:197fdae01d51 user: Don Kjer <don@lindenlab.com> date: Thu Oct 04 06:29:07 2012 +0000 summary: Building headless and non-headless libraries side-by-side, removing the need for the BAKING cmake setting.

changeset: 27620:8f69e00128f2 parent: 27619:58140630a7ac parent: 27616:afcd0002dc5f user: Don Kjer <don@lindenlab.com> date: Thu Oct 04 03:13:14 2012 +0000 summary: Automated merge

changeset: 27619:58140630a7ac user: Don Kjer <don@lindenlab.com> date: Thu Oct 04 03:12:48 2012 +0000 summary: Removing server-related cmake cruft. Fixing libGLU warnings on linux.

changeset: 27618:aa129388e78c user: Don Kjer <don@lindenlab.com> date: Thu Oct 04 00:42:31 2012 +0000 summary: Adding optimization to skip alpha image analysis when it isn't needed.

changeset: 27617:566186c949c8 parent: 27614:152e46d2530b user: Don Kjer <don@lindenlab.com> date: Tue Oct 02 10:17:10 2012 +0000 summary: Updating appearance utility

changeset: 27616:afcd0002dc5f parent: 27615:b8ddf995e20b parent: 27614:152e46d2530b user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Wed Oct 03 18:16:48 2012 -0400 summary: merge

changeset: 27615:b8ddf995e20b parent: 27612:ae139950a3d9 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Wed Oct 03 17:13:18 2012 -0400 summary: additional fixes for avoiding avatar param manipulation via wearables, setting correct state from avatar appearance

changeset: 27614:152e46d2530b user: Don Kjer <don@lindenlab.com> date: Tue Oct 02 01:06:34 2012 +0000 summary: Updating appearance utility version

changeset: 27613:9d87f915f8fa user: Don Kjer <don@lindenlab.com> date: Tue Oct 02 01:02:34 2012 +0000 summary: Moved gatherMorphMaskAlpha into llappearance.

changeset: 27612:ae139950a3d9 user: Don Kjer <don@lindenlab.com> date: Sun Sep 30 09:22:22 2012 +0000 summary: Updating appearance utility version

changeset: 27611:168e25e3b520 user: Don Kjer <don@lindenlab.com> date: Fri Sep 28 23:56:55 2012 +0000 summary: Exposing more tex layer information for hash id generation

changeset: 27610:bc4667e2f43c parent: 27607:f5ed542d7ec1 parent: 27609:e6514a06dd9a user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Fri Sep 28 10:14:07 2012 -0400 summary: merge

changeset: 27609:e6514a06dd9a parent: 27608:abdff59c2016 parent: 27606:ccc8baf56202 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Thu Sep 27 18:20:52 2012 -0400 summary: merge

changeset: 27608:abdff59c2016 parent: 27575:3fa1e8ea565a user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Thu Sep 27 17:46:19 2012 -0400 summary: audited uses of centralBakeVersion vs. isUsingServerBakes

changeset: 27607:f5ed542d7ec1 user: Don Kjer <don@lindenlab.com> date: Fri Sep 28 01:06:17 2012 +0000 summary: Started stubbing out llsd support for tex layer information.

changeset: 27606:ccc8baf56202 parent: 27605:42cd1fba113b parent: 27604:32ee593a8339 user: Nyx Linden <nyx@lindenlab.com> date: Thu Sep 27 22:10:59 2012 +0000 summary: merge

changeset: 27605:42cd1fba113b parent: 27601:ba98d4bc111d user: Nyx Linden <nyx@lindenlab.com> date: Thu Sep 27 22:10:26 2012 +0000 summary: Updating appearance utility src, with fixed merge

changeset: 27604:32ee593a8339 parent: 27603:bf559227fe42 parent: 27601:ba98d4bc111d user: Don Kjer <don@lindenlab.com> date: Thu Sep 27 22:05:02 2012 +0000 summary: Another sunshine-internal -> sunshine-experimental merge

changeset: 27603:bf559227fe42 parent: 27602:125dfac694d9 parent: 27599:64851f05e6ec user: Don Kjer <don@lindenlab.com> date: Thu Sep 27 22:02:05 2012 +0000 summary: Automated merge

changeset: 27602:125dfac694d9 parent: 27594:82a476879542 parent: 27575:3fa1e8ea565a user: Don Kjer <don@lindenlab.com> date: Thu Sep 27 22:01:40 2012 +0000 summary: Merge sunshine-internal -> sunshine-experimental

changeset: 27601:ba98d4bc111d user: Nyx (Neal Orman) <nyx@lindenlab.com> date: Thu Sep 27 17:19:17 2012 -0400 summary: Updating appearance utility source package

changeset: 27600:d7cb373e91e9 parent: 27575:3fa1e8ea565a parent: 27599:64851f05e6ec user: Nyx (Neal Orman) <nyx@lindenlab.com> date: Thu Sep 27 16:54:18 2012 -0400 summary: Merging sunshine-experimental into sunshine-internal

changeset: 27599:64851f05e6ec user: Nyx Linden <nyx@lindenlab.com> date: Thu Sep 27 20:31:09 2012 +0000 summary: Updating appearance utility source

changeset: 27598:a1e5e2b323aa parent: 27597:4da211875991 parent: 27594:82a476879542 user: Nyx Linden <nyx@lindenlab.com> date: Thu Sep 27 20:00:48 2012 +0000 summary: merge

changeset: 27597:4da211875991 parent: 27596:cb078a5073d3 parent: 27592:9db29aa47aa4 user: Nyx Linden <nyx@lindenlab.com> date: Mon Sep 24 17:19:16 2012 +0000 summary: merge

changeset: 27596:cb078a5073d3 parent: 27595:27e9e3ba5c6f parent: 27586:3185f65acb51 user: Nyx Linden <nyx@lindenlab.com> date: Fri Sep 21 18:23:08 2012 +0000 summary: merge

changeset: 27595:27e9e3ba5c6f parent: 27584:e74f344fcec4 user: Nyx Linden <nyx@lindenlab.com> date: Fri Sep 21 18:22:36 2012 +0000 summary: Making computeBodySize public

changeset: 27594:82a476879542 user: Don Kjer <don@lindenlab.com> date: Thu Sep 27 00:38:52 2012 +0000 summary: Fix for mac/linux 'ruth' appearance. Fix for linux build issue

changeset: 27593:04d68745c68c user: Don Kjer <don@lindenlab.com> date: Tue Sep 25 23:27:15 2012 +0000 summary: Wrapping failing llgl assert in gDebugGL

changeset: 27592:9db29aa47aa4 user: Don Kjer <don@lindenlab.com> date: Sun Sep 23 03:06:11 2012 +0000 summary: Removing unused gHeadlessClient code from viewer

changeset: 27591:b1d05fe9a7e9 parent: 27589:7b30d4323db8 parent: 27590:5f81c61025fe user: Don Kjer <don@lindenlab.com> date: Sat Sep 22 19:49:51 2012 -0700 summary: Automated merge

changeset: 27590:5f81c61025fe parent: 27588:f20d5a1dcfa2 user: Don Kjer <don@lindenlab.com> date: Sat Sep 22 19:45:58 2012 -0700 summary: Fixed llhttpclient_test integration test. Removed mini-C++ server code in favor of pre-exising python http server

changeset: 27589:7b30d4323db8 user: Don Kjer <don@lindenlab.com> date: Sat Sep 22 18:25:54 2012 +0000 summary: Updating appearance utility source version

changeset: 27588:f20d5a1dcfa2 user: developer@Developer-PC date: Fri Sep 21 22:21:42 2012 -0700 summary: More windows build fixes

changeset: 27587:748cac437c98 user: Don Kjer <don@lindenlab.com> date: Sat Sep 22 03:39:32 2012 +0000 summary: Fix for missing symbols on windows builds

changeset: 27586:3185f65acb51 parent: 27585:6224d9ab936e parent: 27584:e74f344fcec4 user: Don Kjer <don@lindenlab.com> date: Fri Sep 21 00:38:41 2012 +0000 summary: Automerge

changeset: 27585:6224d9ab936e parent: 27583:da1b6ba76d46 user: Don Kjer <don@lindenlab.com> date: Fri Sep 21 00:36:58 2012 +0000 summary: Updating libosmesa library

changeset: 27584:e74f344fcec4 parent: 27583:da1b6ba76d46 parent: 27563:77eeec6e65cb user: Nyx Linden <nyx@lindenlab.com> date: Thu Sep 20 18:03:45 2012 +0000 summary: merge

changeset: 27583:da1b6ba76d46 user: Don Kjer <don@lindenlab.com> date: Thu Sep 20 17:13:16 2012 +0000 summary: Restoring llrenderheadless changes so we can fix them

changeset: 27582:85bbc8efaeb6 user: Don Kjer <don@lindenlab.com> date: Thu Sep 20 06:32:43 2012 +0000 summary: Fix for windows compile issue

changeset: 27581:95294d95678a user: Don Kjer <don@lindenlab.com> date: Thu Sep 20 05:07:09 2012 +0000 summary: Temporarily disabling llrenderheadless due to build issues

changeset: 27580:a80339798a25 user: Don Kjer <don@lindenlab.com> date: Thu Sep 20 04:59:36 2012 +0000 summary: Updating autobuild.xml mesa library md5sum

changeset: 27579:e8ddf98e8a01 parent: 27577:d59da6834010 parent: 27578:f5f6915e9d54 user: Don Kjer <don@lindenlab.com> date: Thu Sep 20 04:57:04 2012 +0000 summary: Merge sunshine-internal -> sunshine-experimental

changeset: 27578:f5f6915e9d54 parent: 27576:762c7940e0e5 user: Don Kjer <don@lindenlab.com> date: Thu Sep 20 04:56:09 2012 +0000 summary: Skipping experimental filebuffering code on windows for now

changeset: 27577:d59da6834010 parent: 27576:762c7940e0e5 parent: 27561:a019043d1ca4 user: Don Kjer <don@lindenlab.com> date: Thu Sep 20 04:42:46 2012 +0000 summary: Merge sunshine-internal -> sunshine-experimental

changeset: 27576:762c7940e0e5 parent: 27558:4b348452cfc6 user: Don Kjer <don@lindenlab.com> date: Thu Sep 20 04:29:17 2012 +0000 summary: Partial rewrite of llifstream and llofstream (Windows implementation pending). Moved more functionality from llviewerwearable to llwearable

changeset: 27575:3fa1e8ea565a user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Thu Sep 27 05:47:48 2012 -0400 summary: Fix for ruthing in non-server-bake regions

changeset: 27574:2b9394a05127 parent: 27573:0370d36e47c9 parent: 27565:343984197f12 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Wed Sep 26 18:25:26 2012 -0400 summary: merge

changeset: 27573:0370d36e47c9 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Wed Sep 26 18:11:57 2012 -0400 summary: Debug text for avatar appearance state related to server-side baking project

changeset: 27572:568648b50ded user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Wed Sep 26 17:02:46 2012 -0400 summary: Fixed problems caused by defaulting mUseServerBakes to false

changeset: 27571:f84a8ebfc951 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Wed Sep 26 15:45:58 2012 -0400 summary: more state management stuff, DRANO flags for problematic areas

changeset: 27570:c6c871c6950a user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Wed Sep 26 11:52:19 2012 -0400 summary: error checking, comments for areas needing fix/check in appearance

changeset: 27569:da26d2dc7e04 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Wed Sep 26 11:27:13 2012 -0400 summary: use accessors for mUseLocalAppearance, mIsEditingAppearance, mUseServerBakes

changeset: 27568:d7f76db1acda user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Wed Sep 26 06:36:24 2012 -0400 summary: renamed isUsingBakedTextures to more accurate isUsingServerBakes. Commented some areas we are probably using the function incorrectly

changeset: 27567:d66d7a7f0d36 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Wed Sep 19 17:59:27 2012 -0400 summary: small tweaks to param debugging, restricting LLWearable::writeToAvatar

changeset: 27566:68a098af355a parent: 27558:4b348452cfc6 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Wed Sep 19 13:16:59 2012 -0400 summary: work in progress, more debugging/logging of avatar visual param info

changeset: 27565:343984197f12 user: Don Kjer <don@lindenlab.com> date: Mon Sep 24 19:42:58 2012 +0000 summary: Cherry-picked windows build fixes from sunshine-experimental

changeset: 27564:f97dc6d1f311 user: Don Kjer <don@lindenlab.com> date: Mon Sep 24 19:20:28 2012 +0000 summary: Removing .orig and .rej files from ignore

changeset: 27563:77eeec6e65cb user: Nyx Linden <nyx@lindenlab.com> date: Thu Sep 20 17:49:48 2012 +0000 summary: BUILDFIX: not including headless libraries if we haven't defined llrenderheadless

changeset: 27562:d2780bded37e user: Nyx Linden <nyx@lindenlab.com> date: Thu Sep 20 16:01:03 2012 +0000 summary: updating mesa build & hash

changeset: 27561:a019043d1ca4 user: Nyx Linden <nyx@lindenlab.com> date: Wed Sep 19 17:17:25 2012 +0000 summary: Updating mesa libraries to the latest autobuild version

changeset: 27560:e19e8ef14eda parent: 27559:509547914268 parent: 27558:4b348452cfc6 user: Nyx Linden <nyx@lindenlab.com> date: Wed Sep 19 17:06:39 2012 +0000 summary: merge

changeset: 27559:509547914268 parent: 27557:2a4a29afcfa8 user: Nyx Linden <nyx@lindenlab.com> date: Wed Sep 19 17:05:56 2012 +0000 summary: BUILDFIX: enabling the building of the viewer/appearance backend with headless mesa

changeset: 27558:4b348452cfc6 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Fri Sep 14 12:27:50 2012 -0400 summary: fix for windows compile error - missing precompiled header

changeset: 27557:2a4a29afcfa8 user: Nyx (Neal Orman) <nyx@lindenlab.com> date: Fri Sep 14 11:29:17 2012 -0400 summary: BUILDFIX: WIN fixing up windows building issues

changeset: 27556:5b0f92db7abc user: Don Kjer <don@lindenlab.com> date: Fri Sep 14 11:39:17 2012 +0000 summary: Updating to newer llappearance utility

changeset: 27555:471b49596fa8 user: Don Kjer <don@lindenlab.com> date: Fri Sep 14 11:28:16 2012 +0000 summary: Removed temporary debugging build params

changeset: 27554:d46244db384d user: Don Kjer <don@lindenlab.com> date: Fri Sep 14 11:27:04 2012 +0000 summary: Removed appearance utility from viewer source. Added appearance utility autobuild package.

changeset: 27553:d5d6189a5728 user: Don Kjer <don@lindenlab.com> date: Thu Sep 13 22:53:16 2012 +0000 summary: Fix for merge build error. Attempt to cleanup cmake warnings regarding incorrect target_link_libraries

changeset: 27552:9cb047313998 parent: 27550:4329942be460 parent: 27551:c43a0c6aeff2 user: Don Kjer <don@lindenlab.com> date: Thu Sep 13 22:23:53 2012 +0000 summary: Another merge of sunshine -> sunshine-experimental

changeset: 27551:c43a0c6aeff2 parent: 27549:da2752a50279 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Thu Sep 13 17:22:15 2012 -0400 summary: more dump capabilities for visual params and textures in avatar and appearance messages

changeset: 27550:4329942be460 parent: 27542:2b8343cdd691 parent: 27549:da2752a50279 user: Don Kjer <don@lindenlab.com> date: Thu Sep 13 22:14:53 2012 +0000 summary: Merge sunshine -> sunshine-experimental

changeset: 27549:da2752a50279 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Tue Sep 11 20:57:04 2012 -0400 summary: Dump XML tweaks, suppress wearable updates when bakes should dominate

changeset: 27548:c4292986fb27 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Mon Sep 10 18:46:52 2012 -0400 summary: dumpArchetypeXML tweaks, appearance debugging

changeset: 27547:f443675cb33b parent: 27546:bc5167957c85 parent: 27545:8e22819b0152 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Mon Sep 10 11:20:03 2012 -0400 summary: merge

changeset: 27546:bc5167957c85 parent: 27544:9eb706964dfa user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Mon Sep 10 11:17:27 2012 -0400 summary: more baked texture debugging under DebugAvatarCompositeBaked

changeset: 27545:8e22819b0152 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Fri Sep 07 17:48:09 2012 -0400 summary: enhanced XML archetype dumping, added to per-avatar menus

changeset: 27544:9eb706964dfa parent: 27543:1f2e85286f2a parent: 27523:2e8f5113d97c user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Wed Sep 05 18:26:26 2012 -0400 summary: merge

changeset: 27543:1f2e85286f2a parent: 27516:f84405586e1f user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Wed Sep 05 18:25:51 2012 -0400 summary: Debug display for baked vs. composite status, via setting DebugAvatarCompositeBaked

changeset: 27542:2b8343cdd691 user: Don Kjer <don@lindenlab.com> date: Thu Sep 13 10:25:48 2012 +0000 summary: Fleshed out target_link_libraries dependencies between libraries. Appearance utility now reads avatar_lad.xml during stubbed out params processing.

changeset: 27541:d55eb338babb user: Don Kjer <don@lindenlab.com> date: Thu Sep 13 03:30:17 2012 +0000 summary: Instantiated bare-bones LLBakingAvatar concrete class (derived from LLAvatarAppearance). Moved some LLCharacter funcionality from LLVOAvatar to LLAvatarAppearance.

changeset: 27540:f0457a20c5e2 user: Don Kjer <don@lindenlab.com> date: Thu Sep 13 02:09:21 2012 +0000 summary: Moved most of the appearance utility application level logic into LLAppAppearanceUtility. Added LLBakingProcess class for adding new process modes. Create a couple concrete classes for llappearance base classes.

changeset: 27539:a19b7641d5be user: Don Kjer <don@lindenlab.com> date: Wed Sep 12 21:58:21 2012 +0000 summary: Fix for link errors on linux

changeset: 27538:d1c1db8008df user: Nyx Linden <nyx@lindenlab.com> date: Wed Sep 12 21:35:25 2012 +0000 summary: SH-3347 create demo of back end texture baking service

changeset: 27537:549a69cdd160 user: Nyx (Neal Orman) <nyx@lindenlab.com> date: Tue Sep 11 11:59:45 2012 -0400 summary: SH-3264 Moved over a few more items to llappearance

changeset: 27536:2e8389b41a63 user: Nyx (Neal Orman) <nyx@lindenlab.com> date: Mon Sep 10 11:34:17 2012 -0400 summary: BUILDFIX WIN fixing windows build error

changeset: 27535:6ade4317f332 user: Don Kjer <don@lindenlab.com> date: Sun Sep 09 12:12:19 2012 +0000 summary: Fixed crashes on login. Moved most of the remaining character/skeleton generation code into llappearance. Moved non-rendering related LLViewerJoint functionality into LLAvatarJoint.

changeset: 27534:0ca1a975b2b7 user: Don Kjer <don@lindenlab.com> date: Sat Sep 08 06:20:19 2012 +0000 summary: Fixed #include typo

changeset: 27533:33e9e0d56e53 parent: 27532:3e815bcfc9a4 parent: 27531:bb187994575f user: Don Kjer <don@lindenlab.com> date: Sat Sep 08 04:40:18 2012 +0000 summary: Automated merge

changeset: 27532:3e815bcfc9a4 parent: 27529:e12e1d9f9f4c user: Don Kjer <don@lindenlab.com> date: Sat Sep 08 04:39:11 2012 +0000 summary: Removed most llappearance -> llui dependencies (LLTrans remains). Moved LLInventoryIcon::EIconName into LLInventoryType. Moved LLInventoryIcon back to newview. Moved LLUI gl_* functions into llrender.

changeset: 27531:bb187994575f parent: 27529:e12e1d9f9f4c parent: 27530:78ca2bfb79bb user: Nyx (Neal Orman) <nyx@lindenlab.com> date: Fri Sep 07 23:17:38 2012 -0400 summary: Automated merge with https://bitbucket.org/don_linden/sunshine-experimental

changeset: 27530:78ca2bfb79bb parent: 27527:c8150e55ac50 user: Nyx (Neal Orman) <nyx@lindenlab.com> date: Fri Sep 07 23:17:34 2012 -0400 summary: SH-3264 Porting over the XML loading of the avatar structure to llappearance

changeset: 27529:e12e1d9f9f4c user: Don Kjer <don@lindenlab.com> date: Sat Sep 08 01:10:00 2012 +0000 summary: Fleshing out appearance-utility standalone app. Added input/output processing, argument parsing, and general error handling.

changeset: 27528:ec04797158ee user: Don Kjer <don@lindenlab.com> date: Thu Sep 06 22:08:33 2012 +0000 summary: Adding appearance utility package

changeset: 27527:c8150e55ac50 parent: 27526:f66a2c4d4f55 parent: 27525:82eea5aeee68 user: Don Kjer <don@lindenlab.com> date: Thu Sep 06 03:04:10 2012 +0000 summary: Merge

changeset: 27526:f66a2c4d4f55 parent: 27524:85247e401274 user: Don Kjer <don@lindenlab.com> date: Thu Sep 06 02:53:55 2012 +0000 summary: Extracted mWearableDatas from LLAgentWearables into llappearance/LLWearableData. Moved LLDriverParam into llappearance

changeset: 27525:82eea5aeee68 user: Nyx (Neal Orman) <nyx@lindenlab.com> date: Wed Sep 05 17:46:11 2012 -0400 summary: SH-3264 Worked to move over mBakedTextureDatas from LLVOAvatar to LLAvatarAppearance.

changeset: 27524:85247e401274 parent: 27522:4751faba9fe5 parent: 27523:2e8f5113d97c user: Don Kjer <don@lindenlab.com> date: Wed Sep 05 18:36:50 2012 +0000 summary: Merge VirLinden/sunshine -> don_linden/sunshine-experimental

changeset: 27523:2e8f5113d97c parent: 27516:f84405586e1f parent: 25145:63088c18a73c user: Don Kjer <don@lindenlab.com> date: Wed Sep 05 18:23:31 2012 +0000 summary: Merge viewer-development -> VirLinden/sunshine

changeset: 27522:4751faba9fe5 user: Don Kjer <don@lindenlab.com> date: Tue Sep 04 22:49:26 2012 +0000 summary: Cleanup actions from code review of llappearance with nyx

changeset: 27521:203b08fbabd7 user: Don Kjer <don@lindenlab.com> date: Tue Sep 04 17:47:16 2012 +0000 summary: Set virtual inheritance on LLTexture -> LLRefCount

changeset: 27520:ffcee90dd489 user: Don Kjer <don@lindenlab.com> date: Tue Sep 04 17:43:08 2012 +0000 summary: Split gl-specific LLViewerTexture implementation into llrender/LLGLViewerTexture

changeset: 27519:71369a364bba user: Don Kjer <don@lindenlab.com> date: Tue Sep 04 15:18:15 2012 +0000 summary: Split LLTexLayerSetBuffer into llappearance portion, and viewer-specific LLViewerTexLayerSetBuffer

changeset: 27518:2f497572eddc user: Don Kjer <don@lindenlab.com> date: Tue Sep 04 04:24:47 2012 +0000 summary: More clean-up to closer match original file order. For llavatarappearance diffs

changeset: 27517:fbc0b833833a parent: 27501:1a687e5de56e parent: 27516:f84405586e1f user: Don Kjer <don@lindenlab.com> date: Mon Sep 03 20:12:47 2012 +0000 summary: Merge VirLinden/sunshine -> don_linden/sunshine-experimental

changeset: 27516:f84405586e1f user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Thu Aug 30 17:36:03 2012 -0400 summary: log appearance update requests and results

changeset: 27515:2a6e0402a620 parent: 27514:60bb03e24361 parent: 25140:8bb7ca87d916 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Thu Aug 30 10:28:38 2012 -0400 summary: merge

changeset: 27514:60bb03e24361 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Wed Aug 29 18:20:29 2012 -0400 summary: SH-3312 FIX - closing floater with outfit edit now has same behavior as explicitly leaving outfit edit with backarrow

changeset: 27513:1f0da52efafe user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Tue Aug 28 17:59:10 2012 -0400 summary: Force rebake now calls requestServerAppearanceUpdate() if supported

changeset: 27512:c31d46a8c483 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Mon Aug 27 17:37:34 2012 -0400 summary: Fixed issues with mixed grids - new message blocks now variable

changeset: 27511:c6ad50c98180 parent: 27510:9d7e159c6e3c parent: 25136:34dbbe2b00af user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Fri Aug 24 13:55:28 2012 -0400 summary: merge

changeset: 27510:9d7e159c6e3c user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Wed Aug 22 18:51:03 2012 -0400 summary: Removed UseServerTextureBaking setting, now key off region protocol bits

changeset: 27509:4f1b2a2103ec user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Wed Aug 22 16:16:54 2012 -0400 summary: SH-3625 - some associated cleanup, do_update field is useless in various calls because of possible race conditions

changeset: 27508:bc49e2146da3 parent: 27507:88911cb0070e parent: 25100:501e85ad8926 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Wed Aug 22 15:49:38 2012 -0400 summary: merge

changeset: 27507:88911cb0070e user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Wed Aug 22 15:27:34 2012 -0400 summary: SH-3625 WIP - consolidated a couple of attachment removal paths

changeset: 27506:0abae7b0b03d user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Tue Aug 21 17:58:26 2012 -0400 summary: SH-3625 WIP - consolidating code paths for removal, removed dead code

changeset: 27505:02ab942358ad user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Tue Aug 21 17:03:42 2012 -0400 summary: SH-3625 WIP - consolidating code paths for wearable/attachment removal

changeset: 27504:a658f7068537 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Mon Aug 20 18:11:07 2012 -0400 summary: SH-3625 WIP - removeItem(s)FromAvatar use updateAppearanceFromCOF. Some but not all remove code goes through these.

changeset: 27503:f1ded784967c parent: 27502:dce648c261fc parent: 27496:68d8bd505501 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Mon Aug 20 11:08:27 2012 -0400 summary: merge

changeset: 27502:dce648c261fc parent: 27492:01c83222f8fd user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Wed Aug 15 14:28:05 2012 -0400 summary: requestServerAppearanceUpdate bails out if corresponding cap is null

changeset: 27501:1a687e5de56e user: Don Kjer <don@lindenlab.com> date: Mon Sep 03 09:10:24 2012 +0000 summary: Renamed LLVOAvatarDefines to LLAvatarAppearanceDefines

changeset: 27500:8765248b4503 user: Don Kjer <don@lindenlab.com> date: Mon Sep 03 08:37:58 2012 +0000 summary: Cleanup of llappearance refactor file definition order for easier diff'ing

changeset: 27499:0655779e1561 user: Don Kjer <don@lindenlab.com> date: Mon Sep 03 07:00:56 2012 +0000 summary: Fixed typo in cmake file

changeset: 27498:9b622063fa44 user: Don Kjer <don@lindenlab.com> date: Mon Sep 03 06:12:50 2012 +0000 summary: Extracted texture baking system into llappearance library.

changeset: 27497:a69d22e6996e user: Nyx (Neal Orman) <nyx@lindenlab.com> date: Tue Aug 21 18:21:11 2012 -0400 summary: SH-3261 SH-3324 WIP Starting extraction of wearable/appearance libraries

changeset: 27496:68d8bd505501 user: Don Kjer <don@lindenlab.com> date: Fri Aug 17 08:22:50 2012 +0000 summary: Added extended flags to god tools region info response

changeset: 27495:e8b41981e789 user: Don Kjer <don@lindenlab.com> date: Fri Aug 17 06:34:28 2012 +0000 summary: Fix for incorrectly reading extended region flags

changeset: 27494:23d236323756 user: Don Kjer <don@lindenlab.com> date: Fri Aug 17 03:56:38 2012 +0000 summary: Expanding region flags to 64 bits. Adding region protocol flags

changeset: 27493:8bccce434eca parent: 27492:01c83222f8fd parent: 25058:91495f066ee4 user: Don Kjer <don@lindenlab.com> date: Fri Aug 17 01:41:07 2012 +0000 summary: Merge viewer-development -> sunshine

changeset: 27492:01c83222f8fd parent: 27490:5e9ed39765db parent: 27491:194800b74acf user: Nyx (Neal Orman) <nyx@lindenlab.com> date: Tue Aug 14 17:13:46 2012 -0400 summary: Automated merge with https://bitbucket.org/VirLinden/sunshine

changeset: 27491:194800b74acf parent: 27468:2f3e86b08f87 user: Nyx (Neal Orman) <nyx@lindenlab.com> date: Tue Aug 14 17:12:01 2012 -0400 summary: SH-3310 WIP setting up architecture for switching texture baking on per-region basis

changeset: 27490:5e9ed39765db parent: 27489:549ccacca258 parent: 24962:8ea4160af922 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Wed Aug 08 15:52:54 2012 -0700 summary: merge

changeset: 27489:549ccacca258 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Fri Aug 03 17:49:03 2012 -0400 summary: Added viewer param for appearance message version

changeset: 27488:9faf19071d45 parent: 27472:95b4270054db parent: 27487:a126906777b4 user: Don Kjer <don@lindenlab.com> date: Thu Aug 02 23:01:32 2012 +0000 summary: Merge viewer-horde-fixes -> sunshine

changeset: 27487:a126906777b4 parent: 27486:fb9cf836f1e1 parent: 24918:ebe1b9b92a10 user: Don Kjer <don@lindenlab.com> date: Thu Aug 02 22:49:32 2012 +0000 summary: Merge viewer-development -> viewer-horde-fixes

changeset: 27486:fb9cf836f1e1 parent: 27485:3e4273a47252 parent: 24690:1f27cdfdc542 user: Don Kjer <don@lindenlab.com> date: Thu Jul 26 22:59:30 2012 +0000 summary: Merge viewer-development -> viewer-horde-fixes

changeset: 27485:3e4273a47252 parent: 27484:f62797965152 parent: 23895:2f41104f709a user: Don Kjer <don@lindenlab.com> date: Tue Jul 17 16:52:19 2012 +0000 summary: Merge viewer-development -> viewer-horde-fixes

changeset: 27484:f62797965152 user: Don Kjer <don@lindenlab.com> date: Fri Jul 13 02:54:48 2012 +0000 summary: Remove MaxFPS limit during login, teleports, and logout.

changeset: 27483:54a41487698b parent: 27482:797c256bbb2a parent: 23864:f3e86e9aff78 user: Don Kjer <don@lindenlab.com> date: Fri Jul 13 02:09:57 2012 +0000 summary: Merge lindenlab/viewer-development => don_linden/viewer-horde-fixes

changeset: 27482:797c256bbb2a user: Don Kjer <don@lindenlab.com> date: Wed Jul 11 23:58:11 2012 +0000 summary: Adding --skip-gridargs argument to secondlife wrapper script on linux.

changeset: 27481:97ddfe3c1727 user: Don Kjer <don@lindenlab.com> date: Wed Jul 11 00:30:04 2012 +0000 summary: Added LLPipeline eventhost API. Added ForcePeriodicRenderingTime setting.

changeset: 27480:f4cf41e78b5b user: Don Kjer <don@lindenlab.com> date: Tue Jul 10 00:42:10 2012 +0000 summary: Added new settings: DisableAllRenderTypes, DisableAllRenderFeatures, and MaxFPS.

changeset: 27479:81ae9cb47c68 parent: 27478:14ee94eb7330 parent: 23858:c5597ea6ec4a user: Don Kjer <don@lindenlab.com> date: Mon Jul 09 19:46:43 2012 +0000 summary: Merge lindenlab/viewer-development => don_linden/viewer-horde-fixes

changeset: 27478:14ee94eb7330 user: Don Kjer <don@lindenlab.com> date: Mon Jul 09 00:48:02 2012 +0000 summary: Skipping shiftObject pipeline method in headless mode

changeset: 27477:9751cae07b2d user: Don Kjer <don@lindenlab.com> date: Sun Jul 08 10:49:08 2012 +0000 summary: Added support for lib symlinks in deb package.

changeset: 27476:694e871a7ce9 user: Don Kjer <don@lindenlab.com> date: Fri Jul 06 01:53:34 2012 +0000 summary: Change install directory to include viewer version

changeset: 27475:f50175646191 user: Don Kjer <don@lindenlab.com> date: Fri Jul 06 01:12:54 2012 +0000 summary: Adding debian package build to teamcity build script.

changeset: 27474:df747f872d0e user: Don Kjer <don@lindenlab.com> date: Wed Jul 04 01:30:55 2012 +0000 summary: Adding initial debian packaging configuration

changeset: 27473:ac08b6db4a9f parent: 23856:23eb94a3e980 user: Don Kjer <don@lindenlab.com> date: Tue Jul 03 01:06:04 2012 +0000 summary: Added more rendering-code early-exits when in headless mode.

changeset: 27472:95b4270054db parent: 27471:c4a859a11cd8 parent: 27470:1e140dbbccba user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Thu Aug 02 18:58:39 2012 -0400 summary: merge

changeset: 27471:c4a859a11cd8 parent: 27469:d641265154f7 parent: 24918:ebe1b9b92a10 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Thu Aug 02 18:57:49 2012 -0400 summary: merge

changeset: 27470:1e140dbbccba user: Don Kjer <don@lindenlab.com> date: Thu Aug 02 22:54:01 2012 +0000 summary: Added AppearanceData block to AvatarAppearance message

changeset: 27469:d641265154f7 parent: 27468:2f3e86b08f87 parent: 25054:78ca0bbf43a9 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Mon Jul 30 19:10:46 2012 -0400 summary: merge

changeset: 27468:2f3e86b08f87 user: Nyx (Neal Orman) <nyx@lindenlab.com> date: Wed Jul 25 15:22:13 2012 -0400 summary: SH-3258 WIP Adding new switching of new vs old appearance based on appearance message

changeset: 27467:a9334c71a8bb user: Nyx (Neal Orman) <nyx@lindenlab.com> date: Tue Jul 17 14:34:35 2012 -0400 summary: SH-3258 WIP revert to server-generated textures

changeset: 27466:231fa0ab1230 parent: 27464:27dbd07233f3 parent: 27465:12e097fac93e user: Nyx (Neal Orman) <nyx@lindenlab.com> date: Mon Jul 16 17:29:07 2012 -0400 summary: Automated merge with https://bitbucket.org/VirLinden/sunshine

changeset: 27465:12e097fac93e parent: 27460:53ea36b53da5 user: Nyx (Neal Orman) <nyx@lindenlab.com> date: Mon Jul 16 17:29:01 2012 -0400 summary: SH-3261 WIP Updated texture switching code

changeset: 27464:27dbd07233f3 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Fri Jul 13 16:59:57 2012 -0400 summary: SH-3267 WIP - extract cof version from avatar appearance message, use to reject stale updates

changeset: 27463:7b11a6e42205 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Thu Jul 12 18:24:23 2012 -0400 summary: SH-3267 WIP

changeset: 27462:a3756b55eef1 parent: 27461:85b40414df3b parent: 27460:53ea36b53da5 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Thu Jul 12 11:09:46 2012 -0400 summary: merge

changeset: 27461:85b40414df3b parent: 27459:e6a173df1915 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Thu Jul 12 11:09:27 2012 -0400 summary: SH-3267 WIP

changeset: 27460:53ea36b53da5 user: Nyx (Neal Orman) <nyx@lindenlab.com> date: Wed Jul 11 18:30:39 2012 -0400 summary: SH-3258 WIP initial work: refactoring appearance editing mode

changeset: 27459:e6a173df1915 user: Nyx (Neal Orman) <nyx@lindenlab.com> date: Mon Jul 09 14:03:08 2012 -0400 summary: SH-3171 FIX switched texture pipeline to use the new cap request URL

changeset: 27458:f3b934445ead parent: 27457:b46114313ad4 parent: 25046:14b47f7cb435 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Fri Jul 06 17:14:28 2012 -0400 summary: merge

changeset: 27457:b46114313ad4 user: Nyx (Neal Orman) <nyx@lindenlab.com> date: Mon Jul 02 18:17:56 2012 -0400 summary: FIX: renamed UpdateAgentAppearance to UpdateAvatarAppearance

changeset: 27456:86e9444f57eb user: Nyx (Neal Orman) <nyx@lindenlab.com> date: Fri Jun 29 19:18:33 2012 -0400 summary: SH-3229 FIX suppress baked texture cache requests and generated agentAppearance messages

changeset: 27455:25c0ca01095e user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Fri Jun 29 13:08:00 2012 -0400 summary: SH-3226 WIP - request appearance update request, connects to UpdateAgentAppearance cap, in updateAppearanceFromCOF()

changeset: 27454:4fdaaf4ed707 parent: 27453:a9241f30185c parent: 27452:3c551749c9a4 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Thu Jun 28 14:24:37 2012 -0400 summary: merge

changeset: 27453:a9241f30185c parent: 27449:8a76888c0510 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Thu Jun 28 14:24:04 2012 -0400 summary: SH-3228 WIP - always respond to processAppearance for self, convert baked textures to checkerboards

changeset: 27452:3c551749c9a4 user: Nyx (Neal Orman) <nyx@lindenlab.com> date: Thu Jun 28 11:05:32 2012 -0400 summary: SH-3230 Disable texture readback & upload

changeset: 27451:b833c0930ce2 parent: 27449:8a76888c0510 parent: 27450:da3f76a18e8a user: Nyx (Neal Orman) <nyx@lindenlab.com> date: Wed Jun 27 17:40:40 2012 -0400 summary: Automated merge with https://bitbucket.org/VirLinden/sunshine

changeset: 27450:da3f76a18e8a parent: 27448:5fcac2cc0d08 user: Nyx (Neal Orman) <nyx@lindenlab.com> date: Wed Jun 27 17:40:19 2012 -0400 summary: SH-3231 FIX Process new texture fetch url from login.cgi

changeset: 27449:8a76888c0510 parent: 27448:5fcac2cc0d08 parent: 25043:5e554e5f1983 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Wed Jun 27 11:33:19 2012 -0400 summary: merge

changeset: 27448:5fcac2cc0d08 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Tue Jun 26 16:05:03 2012 -0400 summary: SH-3172 WIP - fix

changeset: 27447:f111e284ea19 user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Mon Jun 25 13:50:39 2012 -0400 summary: SH-3172 WIP - useServerTextureBaking() func

changeset: 27446:2b5653273482 parent: 25041:1b0cf779a88d user: Brad Payne (Vir Linden) <vir@lindenlab.com> date: Fri Jun 22 17:08:49 2012 -0400 summary: SH-3172 WIP - debug setting for settings.xml

changeset: 27445:0ca3910763ce parent: 27444:461e5e3c950d parent: 27436:0f2779556afb user: Oz Linden <oz@lindenlab.com> date: Wed Apr 03 15:11:28 2013 -0400 summary: merge changes for 3.5.0-release

changeset: 27444:461e5e3c950d parent: 27443:78b6d9985dbf parent: 27435:adc360e6bf21 user: Oz Linden <oz@lindenlab.com> date: Mon Apr 01 09:34:41 2013 -0400 summary: merge changes for 3.5.0-beta7

changeset: 27443:78b6d9985dbf parent: 27442:d4e5dd7ef0a2 parent: 27414:61e374bd07fd user: Oz Linden <oz@lindenlab.com> date: Thu Mar 28 10:12:18 2013 -0400 summary: merge changes for 3.5.0-beta6

changeset: 27442:d4e5dd7ef0a2 parent: 27441:d2aa3933d6bc parent: 27383:e7cabbf8470c user: Oz Linden <oz@lindenlab.com> date: Thu Mar 21 22:10:38 2013 -0400 summary: merge changes for 3.5.0-beta5

changeset: 27441:d2aa3933d6bc parent: 27440:68a9d0cb0314 parent: 27373:7b7566bcf6da user: Oz Linden <oz@lindenlab.com> date: Thu Mar 21 10:57:38 2013 -0400 summary: merge changes for 3.5.0-beta4

changeset: 27440:68a9d0cb0314 parent: 27282:542ee45430af parent: 27331:dce08ca19097 user: Oz Linden <oz@lindenlab.com> date: Wed Mar 13 19:09:00 2013 -0400 summary: merge changes for 3.5.0-beta3

changeset: 27439:83e64b85795e user: Nicky Perian <nickyperian@yahoo.com> date: Thu Apr 04 19:12:36 2013 -0500 summary: Added tag Kokua-3.5.0 for changeset 7166ba3769d3

changeset: 27438:7166ba3769d3 tag: Kokua-3.5.0 user: Nicky Perian <nickyperian@yahoo.com> date: Thu Mar 28 08:14:58 2013 -0500 summary: Version settings Kokua-3.5.0