Files
SingularityViewer/indra/llmessage
Lirusaito fd453593b3 Merge branch 'Moap' of git://github.com/Shyotl/SingularityViewer into VoiceUpdate
Conflicts:
	indra/newview/llfloateravatarinfo.cpp - llpanelprofile.cpp update
	indra/newview/llfloatergroupinfo.cpp - llgroupactions.cpp update
	indra/newview/llfloaterobjectiminfo.cpp - simple merge
	indra/newview/llstartup.cpp - Followed Shyotl's directions from 07165961dc
	indra/newview/llviewermedia.cpp - includes conflict, simple stuff.

SLURL update:
	indra/newview/llavataractions.cpp
	indra/newview/llgroupactions.cpp
2013-06-11 15:32:18 -04:00
..
2012-04-29 00:25:40 -04:00
2013-05-07 02:01:31 +02:00
2013-05-21 23:34:23 +02:00
2013-05-12 18:10:49 +02:00
2013-01-08 17:50:09 +01:00
2012-12-24 19:58:54 +01:00
2012-03-06 07:31:15 +01:00
2012-10-26 04:13:29 +02:00
2013-02-12 20:47:55 -06:00
2013-02-12 20:47:55 -06:00
2012-08-09 10:56:29 -04:00
2012-11-03 14:13:13 +01:00
2012-03-06 07:31:15 +01:00
2012-10-31 05:01:24 +01:00
2012-07-16 22:35:04 +02:00
2013-02-12 20:47:55 -06:00
2012-03-06 07:31:15 +01:00
2012-11-03 14:13:13 +01:00
2012-10-31 23:11:42 +01:00
2012-07-20 08:13:07 -04:00
2012-11-03 14:13:13 +01:00
2012-03-06 07:31:15 +01:00