Merge branch 'master' of git://github.com/siana/SingularityViewer.git

Conflicts: indra/llrender/llglstates.h
2011-03-25 17:54:52 -05:00
parent 459deb4288 86f7987e13
commit b887d3147e
25 changed files with 1298 additions and 152 deletions
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -226,6 +226,8 @@ const F64 CHAT_AGE_FAST_RATE = 3.0;

 // The agent instance.
 LLAgent gAgent;
+std::string gAuthString;
+
 // <edit>
 LLUUID gReSitTargetID;
 LLVector3 gReSitOffset;