Commit Graph

3 Commits

Author SHA1 Message Date
Shyotl
6ad9367c24 Trying out new LLCachedControl implementation. 2011-07-16 23:36:56 -05:00
Aleric Inglewood
41f13dbf46 Merge branch 'master' of https://github.com/siana/SingularityViewer
Added missing header to indra/newview/ascentkeyword.cpp now that
llviewerpluginmanager.h has a couple of header dependencies less.

Resolved Conflicts:
	indra/llcommon/CMakeLists.txt

Proximity: addition of two independent things. Just included both.
2011-05-14 01:06:19 +02:00
TighMacFanatic
56c357911e Chat keyword highlighting 2011-05-01 02:31:05 -04:00