Second Life viewer sources 1.19.1.2

6 files changed, 12 insertions, 19 deletions

diff --git a/linden/indra/llmessage/llblowfishcipher.cpp b/linden/indra/llmessage/llblowfishcipher.cpp
index cdaa096..45ff045 100644
--- a/linden/indra/llmessage/llblowfishcipher.cpp
+++ b/linden/indra/llmessage/llblowfishcipher.cpp
@@ -2,9 +2,6 @@
  * @file llblowfishcipher.cpp
  * @brief Wrapper around OpenSSL Blowfish encryption algorithm.
  *
- * We do not have OpenSSL headers or libraries on Windows, so this
- * class only works on Linux.
- *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
  * Copyright (c) 2007-2008, Linden Research, Inc.
diff --git a/linden/indra/llmessage/llcurl.h b/linden/indra/llmessage/llcurl.h
index 3d9770b..2737f6e 100644
--- a/linden/indra/llmessage/llcurl.h
+++ b/linden/indra/llmessage/llcurl.h
@@ -150,13 +150,10 @@ public:
         static std::vector<LLMutex*> sSSLMutex;
 
         // OpenSSL callbacks
-        static void LLCurl::ssl_locking_callback(int mode, int type, const char *file, int line);
-        static unsigned long LLCurl::ssl_thread_id(void);
-        
-        
-        
-private:
+        static void ssl_locking_callback(int mode, int type, const char *file, int line);
+        static unsigned long ssl_thread_id(void);
 
+private:
         static std::string sCAPath;
         static std::string sCAFile;
 };
diff --git a/linden/indra/llmessage/llhttpnode.cpp b/linden/indra/llmessage/llhttpnode.cpp
index afd27e9..540b507 100644
--- a/linden/indra/llmessage/llhttpnode.cpp
+++ b/linden/indra/llmessage/llhttpnode.cpp
@@ -169,15 +169,9 @@ void LLHTTPNode::del(LLHTTPNode::ResponsePtr response, const LLSD& context) cons
 }
 
 // virtual
-LLSD LLHTTPNode::del() const
-{
-        throw NotImplemented();
-}
-
-// virtual
 LLSD LLHTTPNode::del(const LLSD&) const
 {
-        return del();
+        throw NotImplemented();
 }
 
 
diff --git a/linden/indra/llmessage/llhttpnode.h b/linden/indra/llmessage/llhttpnode.h
index b4d4aed..7d9cb95 100644
--- a/linden/indra/llmessage/llhttpnode.h
+++ b/linden/indra/llmessage/llhttpnode.h
@@ -86,7 +86,6 @@ public:
                 virtual LLSD put(const LLSD& input) const;
                 virtual LLSD post(const LLSD& input) const;
 
-                virtual LLSD del() const;
                 virtual LLSD del(const LLSD& context) const;
 
                 class Response : public LLRefCount
@@ -109,6 +108,7 @@ public:
                 virtual void get(ResponsePtr, const LLSD& context) const;
                 virtual void put(ResponsePtr, const LLSD& context, const LLSD& input) const;
                 virtual void post(ResponsePtr, const LLSD& context, const LLSD& input) const;
+        
                 virtual void del(ResponsePtr, const LLSD& context) const;
         //@}
         
diff --git a/linden/indra/llmessage/llpartdata.cpp b/linden/indra/llmessage/llpartdata.cpp
index 606abd0..b77536d 100644
--- a/linden/indra/llmessage/llpartdata.cpp
+++ b/linden/indra/llmessage/llpartdata.cpp
@@ -155,6 +155,8 @@ void LLPartData::setEndAlpha(const F32 alpha)
 LLPartSysData::LLPartSysData()
 {
         mCRC = 0;
+        mFlags = 0;
+
         mPartData.mFlags = 0;
         mPartData.mStartColor = LLColor4(1.f, 1.f, 1.f, 1.f);
         mPartData.mEndColor = LLColor4(1.f, 1.f, 1.f, 1.f);
@@ -172,6 +174,8 @@ LLPartSysData::LLPartSysData()
         mBurstSpeedMin = 1.f;                                           // Minimum particle velocity
         mBurstSpeedMax = 1.f;                                           // Maximum particle velocity
         mBurstRadius = 0.f;
+
+        mNumParticles = 0;
 }
 
 
diff --git a/linden/indra/llmessage/llpartdata.h b/linden/indra/llmessage/llpartdata.h
index 216e547..82757ec 100644
--- a/linden/indra/llmessage/llpartdata.h
+++ b/linden/indra/llmessage/llpartdata.h
@@ -84,7 +84,8 @@ class LLPartData
 public:
         LLPartData() :
                 mFlags(0),
-                mMaxAge(0)
+                mMaxAge(0.f),
+                mParameter(0.f)
         {
         }
         BOOL unpack(LLDataPacker &dp);
@@ -108,7 +109,7 @@ public:
                 LL_PART_BEAM_MASK =                             0x200,          // Particle is a "beam" connecting source and target
 
                 // Not implemented yet!
-                //LL_PART_RANDOM_ACCEL_MASK =           0x100,          // Patricles have random accelearation
+                //LL_PART_RANDOM_ACCEL_MASK =           0x100,          // Particles have random acceleration
                 //LL_PART_RANDOM_VEL_MASK =             0x200,          // Particles have random velocity shifts"
                 //LL_PART_TRAIL_MASK =                  0x400,          // Particles have historical "trails"