1 files changed, 46 insertions, 1 deletions

diff --git a/linden/indra/llcrashlogger/llcrashlogger.cpp b/linden/indra/llcrashlogger/llcrashlogger.cpp
index 948932f..0fd8f63 100755
--- a/linden/indra/llcrashlogger/llcrashlogger.cpp
+++ b/linden/indra/llcrashlogger/llcrashlogger.cpp
@@ -96,6 +96,33 @@ LLCrashLogger::~LLCrashLogger()
 
 }
 
+// TRIM_SIZE must remain larger than LINE_SEARCH_SIZE.
+const int TRIM_SIZE = 128000;
+const int LINE_SEARCH_DIST = 500;
+const std::string SKIP_TEXT = "\n ...Skipping... \n";
+void trimSLLog(std::string& sllog)
+{
+        if(sllog.length() > TRIM_SIZE * 2)
+        {
+                std::string::iterator head = sllog.begin() + TRIM_SIZE;
+                std::string::iterator tail = sllog.begin() + sllog.length() - TRIM_SIZE;
+                std::string::iterator new_head = std::find(head, head - LINE_SEARCH_DIST, '\n');
+                if(new_head != head - LINE_SEARCH_DIST)
+                {
+                        head = new_head;
+                }
+
+                std::string::iterator new_tail = std::find(tail, tail + LINE_SEARCH_DIST, '\n');
+                if(new_tail != tail + LINE_SEARCH_DIST)
+                {
+                        tail = new_tail;
+                }
+
+                sllog.erase(head, tail);
+                sllog.insert(head, SKIP_TEXT.begin(), SKIP_TEXT.end());
+        }
+}
+
 void LLCrashLogger::gatherFiles()
 {
 
@@ -152,6 +179,17 @@ void LLCrashLogger::gatherFiles()
                 mCrashHost += mDebugLog["CurrentSimHost"].asString();
                 mCrashHost += ":12043/crash/report";
         }
+        else if(mDebugLog.has("GridName"))
+        {
+                // This is a 'little' hacky, but its the best simple solution.
+                std::string grid_host = mDebugLog["GridName"].asString();
+                LLString::toLower(grid_host);
+
+                mCrashHost = "https://login.";
+                mCrashHost += grid_host;
+                mCrashHost += ".lindenlab.com:12043/crash/report";
+        }
+
         // Use login servers as the alternate, since they are already load balanced and have a known name
         mAltCrashHost = "https://login.agni.lindenlab.com:12043/crash/report";
 
@@ -171,7 +209,14 @@ void LLCrashLogger::gatherFiles()
                 }
                 std::stringstream s;
                 s << f.rdbuf();
-                mCrashInfo[(*itr).first] = s.str();
+
+                std::string crash_info = s.str();
+                if(itr->first == "SecondLifeLog")
+                {
+                        trimSLLog(crash_info);
+                }
+
+                mCrashInfo[(*itr).first] = crash_info;
         }
 }