From b5936a4b1d8780b5b8cd425998eacd2c64ffa693 Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Thu, 3 Apr 2008 19:21:14 +0000
Subject: 1.19.1 Viewer merge: QAR_367, QAR-374, QAR-408, QAR-426 QAR_367 (RC1)
- merge Branch_1-19-1-Viewer -r 81609 : 81993 -> release QAR-374 (RC2) -
merge Branch_1-19-1-Viewer -r 81993 : 82589 -> release QAR-408 (RC3) - merge
Branch_1-19-1-Viewer -r 82589 : 83128 -> release QAR-426 (rc4) - merge
Branch_1-19-1-Viewer -r 83125 : 83719 -> release (Actual merge: release@83793
Branch_1-19-1-Viewer-merge@83953 -> release)
---
indra/llmessage/llblowfishcipher.cpp | 3 ---
indra/llmessage/llcurl.cpp | 1 -
indra/llmessage/llcurl.h | 9 +++------
indra/llmessage/llhttpnode.cpp | 8 +-------
indra/llmessage/llhttpnode.h | 1 -
indra/llmessage/llnamevalue.h | 1 +
indra/llmessage/llpartdata.cpp | 4 ++++
indra/llmessage/llpartdata.h | 5 +++--
8 files changed, 12 insertions(+), 20 deletions(-)
(limited to 'indra/llmessage')
diff --git a/indra/llmessage/llblowfishcipher.cpp b/indra/llmessage/llblowfishcipher.cpp
index 7c9194d603..8c055a72f6 100644
--- a/indra/llmessage/llblowfishcipher.cpp
+++ b/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, Linden Research, Inc.
diff --git a/indra/llmessage/llcurl.cpp b/indra/llmessage/llcurl.cpp
index 8b9a45ff3f..8afcb6ba4f 100644
--- a/indra/llmessage/llcurl.cpp
+++ b/indra/llmessage/llcurl.cpp
@@ -121,7 +121,6 @@ void LLCurl::Responder::error(U32 status, const std::string& reason)
// virtual
void LLCurl::Responder::result(const LLSD& content)
{
- llwarns << "Virtual Function not implemented" << llendl;
}
// virtual
diff --git a/indra/llmessage/llcurl.h b/indra/llmessage/llcurl.h
index 48c14d9460..1b3d3f6266 100644
--- a/indra/llmessage/llcurl.h
+++ b/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/indra/llmessage/llhttpnode.cpp b/indra/llmessage/llhttpnode.cpp
index 1289b63d79..b82bd65d2e 100644
--- a/indra/llmessage/llhttpnode.cpp
+++ b/indra/llmessage/llhttpnode.cpp
@@ -168,16 +168,10 @@ 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/indra/llmessage/llhttpnode.h b/indra/llmessage/llhttpnode.h
index 2f177bf0ef..e27056a51f 100644
--- a/indra/llmessage/llhttpnode.h
+++ b/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
diff --git a/indra/llmessage/llnamevalue.h b/indra/llmessage/llnamevalue.h
index 4d40328c59..f50ed08207 100644
--- a/indra/llmessage/llnamevalue.h
+++ b/indra/llmessage/llnamevalue.h
@@ -46,6 +46,7 @@
// SitObject STRING
// SitPosition VEC3
+#include "string_table.h"
#include "llmath.h"
#include "v3math.h"
#include "lldbstrings.h"
diff --git a/indra/llmessage/llpartdata.cpp b/indra/llmessage/llpartdata.cpp
index 0e1dc4a7bd..792d03e72b 100644
--- a/indra/llmessage/llpartdata.cpp
+++ b/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/indra/llmessage/llpartdata.h b/indra/llmessage/llpartdata.h
index 4220f5d791..b16cdc5141 100644
--- a/indra/llmessage/llpartdata.h
+++ b/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"
--
cgit v1.2.3