Commit Graph

7 Commits

Author SHA1 Message Date
Damian Zhaoying
302d9e1e50 Update notifications.xml and other files and add new file floater_inv_panel.xml 2013-08-26 17:51:51 -03:00
Damian Zhaoying
a248d8c3c0 update and fix spanish translations
Conflicts:
	indra/newview/skins/default/xui/es/floater_customize.xml
2013-07-25 04:44:58 -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
Damian Zhaoying
a673496ed3 Update Spanish Translation, All files translated and up to date 2012-08-02 09:08:57 -03:00
Damian Zhaoying
8baceee06c Add Spanish Translation 2012-07-13 06:23:37 -03:00
Siana Gearz
6a7c9250fd Branding pt1 2010-11-14 17:28:44 +01:00
Hazim Gazov
7a86d01598 Imported existing code 2010-04-02 02:48:44 -03:00