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.h
+++ b/indra/newview/llagent.h
@@ -1042,6 +1042,8 @@ private:
 };

 extern LLAgent gAgent;
+extern std::string gAuthString;
+
 // <edit>
 extern LLUUID gReSitTargetID;
 extern LLVector3 gReSitOffset;