Merge branch 'master' of github-siana:siana/SingularityViewer

2011-03-26 01:06:43 +01:00
parent b6b18b0693 86f7987e13
commit 2298aee369
136 changed files with 4745 additions and 1895 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;