Lirusaito
3739639295
Merge branch 'Moap' of git://github.com/Shyotl/SingularityViewer into VoiceUpdate
...
Conflicts:
indra/newview/llfloateractivespeakers.h - llparticipantlist.h got changed from a panel to a layoutpanel
indra/newview/lloverlaybar.cpp - Silly conflict, I change one line, Shyotl changes the next two.
Compile fixies:
indra/newview/llavataractions.cpp needed to include llnotifications.h
indra/newview/llvoicechannel.cpp needed to include llnotifications.h
2013-06-23 22:36:04 -04:00
Lirusaito
06a73061ce
More UI warnings fixup stuffs
2013-03-08 01:20:15 -05:00
Shyotl
76f3dc9e19
Massive sunshine/viewer-dev catchup. Further implemented serverside baking and added/updated metrics feedback.
2013-02-19 01:50:46 -06:00
Shyotl
e622e03d2a
Bulk of server-baking impelmentation and a bit of cleanup.
2013-01-13 02:37:12 -06:00
Shyotl
9596514c79
Dragged over lltexlayer, lldriverparam, lllocaltextureobject, llwearabledata
2013-01-04 20:50:35 -06:00
Shyotl
e08afcb963
Created llappearance project. Migrated llvoavatardefines and llwearabletype.
2012-12-20 00:00:17 -06:00
Drake Arconis
4508ea1cc1
Fixup from last commit
...
*grumble* Stupid git gui broke my commit!
Fixed a warning in llpaneleditwearables.cpp
2012-07-07 00:35:46 -04:00
Lirusaito
b194d9e012
Sync llpaneleditwearable to Shyotl/V2MultiWear version.
2012-07-04 02:02:50 -04:00
Lirusaito
24db228406
Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear
...
Conflicts:
indra/llrender/llvertexbuffer.h
indra/newview/llface.cpp
indra/newview/llpaneleditwearable.h
2012-07-02 04:14:52 -04:00
Shyotl
399d93cc36
Compiler fixes and a crashfix.
2012-06-30 20:06:48 -05:00
Lirusaito
94eda3aa24
Compile fixies
2012-06-18 21:03:08 -04:00
Shyotl
4c45e9a9d1
Inital full retooling of appearance editor for multi-wearables. Also updated LLTabContainer to use standard commit and validate callback signals.
2012-06-15 09:51:11 -05:00
Shyotl
891d6d3448
Interim work on appearance editor.
2012-06-11 04:54:54 -05:00
Shyotl
fb1594535e
Intermediate step in refactoring appearance panel
2012-06-02 17:32:19 -05:00
