6 Commits

Author	SHA1	Message	Date
Lirusaito	139a10e77c	Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer into VoiceUpdate ... Conflicts: indra/newview/llpanelface.* -Knew these would conflict just from proximity	2013-06-25 23:49:04 -04:00
Lirusaito	8fb8e74e54	Fix the crash upon hitting select for an object's light color feature ... Modernizes LLTextureControl(, LLFloaterTexturePicker) and LLColorSwatch Updates LLPanelVolume, LLPanelObject, and LLPanelFace to prevent related crashes and compile. Adds translation string InventoryNoTexture to strings.xml (added to all existing translations from upstream translation)	2013-06-25 23:02:15 -04:00
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
Shyotl	ef3e918558	Initial moap commit. /VERY/ WIP. Primarily committed to clean up unstaged changes. Do not run this, even if it may compile, as it will NOT work (for a myriad of reasons)!	2013-05-31 05:33:41 -05:00
Beeks	24f3101629	Tagteam Texture Editor Commit Night! ... Update 1: Align Planar Textures. Update 2: Copy/Paste buttons for texture params now work. Sorry about another two-in-one patch, but y'can't really change one without the other on this. Signed-off-by: Beeks <HgDelirium@gmail.com>	2010-09-15 20:38:33 -04:00
Hazim Gazov	7a86d01598	Imported existing code	2010-04-02 02:48:44 -03:00