Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleaned up a few minor things

Browse Source
This commit is contained in:
Shyotl
2011-03-27 18:50:04 -05:00
parent 8323a701e8
commit 18af6baedd
4 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
indra/llcommon/llchat.h
View File

@@ -34,7 +34,6 @@
#ifndef LL_LLCHAT_H #ifndef LL_LLCHAT_H
#define LL_LLCHAT_H #define LL_LLCHAT_H
#include "llstring.h"
#include "lluuid.h" #include "lluuid.h"
#include "v3math.h" #include "v3math.h"
@@ -71,7 +70,7 @@ typedef enum e_chat_audible_level
class LLChat class LLChat
{ {
public: public:
LLChat(const std::string& text = LLStringUtil::null) LLChat(const std::string& text = std::string())
: mText(text), : mText(text),
mFromName(), mFromName(),
mFromID(), mFromID(),

3
indra/llcommon/llerror.cpp
View File

@@ -45,9 +45,6 @@
# include <syslog.h> # include <syslog.h>
# include <unistd.h> # include <unistd.h>
#endif // !LL_WINDOWS #endif // !LL_WINDOWS
#if LL_WINDOWS
# include <windows.h>
#endif // LL_WINDOWS
#include <vector> #include <vector>
#include "llapp.h" #include "llapp.h"

5
indra/llcommon/llsdserialize.h
View File

@@ -639,7 +639,7 @@ protected:
* </code> * </code>
*/ */
template <class Formatter> template <class Formatter>
class LLSDOStreamer : public Formatter class LLSDOStreamer
{ {
public: public:
/** /**
@@ -660,7 +660,8 @@ public:
std::ostream& str, std::ostream& str,
const LLSDOStreamer<Formatter>& formatter) const LLSDOStreamer<Formatter>& formatter)
{ {
formatter.format(formatter.mSD, str, formatter.mOptions); LLPointer<Formatter> f = new Formatter;
f->format(formatter.mSD, str, formatter.mOptions);
return str; return str;
} }

3
indra/llvfs/lllfsthread.cpp
View File

@@ -184,7 +184,7 @@ bool LLLFSThread::Request::processRequest()
if (mOperation == FILE_READ) if (mOperation == FILE_READ)
{ {
llassert(mOffset >= 0); llassert(mOffset >= 0);
LLAPRFile infile ; LLAPRFile infile ; // auto-closes
infile.open(mFileName, LL_APR_RB, LLAPRFile::local); infile.open(mFileName, LL_APR_RB, LLAPRFile::local);
if (!infile.getFileHandle()) if (!infile.getFileHandle())
{ {
@@ -200,7 +200,6 @@ bool LLLFSThread::Request::processRequest()
llassert_always(off >= 0); llassert_always(off >= 0);
mBytesRead = infile.read(mBuffer, mBytes ); mBytesRead = infile.read(mBuffer, mBytes );
complete = true; complete = true;
infile.close() ;
// llinfos << "LLLFSThread::READ:" << mFileName << " Bytes: " << mBytesRead << llendl; // llinfos << "LLLFSThread::READ:" << mFileName << " Bytes: " << mBytesRead << llendl;
} }
else if (mOperation == FILE_WRITE) else if (mOperation == FILE_WRITE)