Fix some compiler warnings/errors. Error in llinventorymodelbackgroundfetch was introduced by partial commit.
This commit is contained in:
@@ -35,6 +35,7 @@
|
||||
class LLTextureManagerBridge
|
||||
{
|
||||
public:
|
||||
virtual ~LLTextureManagerBridge(){};
|
||||
virtual LLPointer<LLGLTexture> getLocalTexture(BOOL usemipmaps = TRUE, BOOL generate_gl_tex = TRUE) = 0;
|
||||
virtual LLPointer<LLGLTexture> getLocalTexture(const U32 width, const U32 height, const U8 components, BOOL usemipmaps, BOOL generate_gl_tex = TRUE) = 0;
|
||||
virtual LLGLTexture* getFetchedTexture(const LLUUID &image_id) = 0;
|
||||
|
||||
@@ -35,6 +35,7 @@
|
||||
class LLTranslationBridge
|
||||
{
|
||||
public:
|
||||
virtual ~LLTranslationBridge(){};
|
||||
virtual std::string getString(const std::string &xml_desc) = 0;
|
||||
};
|
||||
|
||||
|
||||
@@ -776,7 +776,7 @@ std::streamsize llstdio_filebuf::xsgetn(char_type* __s, std::streamsize __n)
|
||||
return __ret;
|
||||
}
|
||||
|
||||
std::streamsize llstdio_filebuf::xsputn(char_type* __s, std::streamsize __n)
|
||||
std::streamsize llstdio_filebuf::xsputn(char_type const* __s, std::streamsize __n)
|
||||
{
|
||||
// Optimization in the always_noconv() case, to be generalized in the
|
||||
// future: when __n is sufficiently large we write directly instead of
|
||||
|
||||
@@ -186,7 +186,7 @@ protected:
|
||||
/*virtual*/ int sync();
|
||||
|
||||
std::streamsize xsgetn(char_type*, std::streamsize);
|
||||
std::streamsize xsputn(char_type*, std::streamsize);
|
||||
std::streamsize xsputn(char_type const*, std::streamsize);
|
||||
#endif
|
||||
};
|
||||
|
||||
|
||||
@@ -187,7 +187,8 @@ void LLInventoryModelBackgroundFetch::backgroundFetchCB(void *)
|
||||
|
||||
void LLInventoryModelBackgroundFetch::backgroundFetch()
|
||||
{
|
||||
if (mBackgroundFetchActive && gAgent.getRegion() && gAgent.getRegion()->capabilitiesReceived())
|
||||
LLViewerRegion* region = gAgent.getRegion();
|
||||
if (mBackgroundFetchActive && region && region->capabilitiesReceived())
|
||||
{
|
||||
// If we'll be using the capability, we'll be sending batches and the background thing isn't as important.
|
||||
std::string url = region->getCapability("FetchInventory2");
|
||||
|
||||
@@ -26,6 +26,8 @@
|
||||
#include "rlvdefines.h"
|
||||
#include "rlvcommon.h"
|
||||
|
||||
class LLViewerWearable;
|
||||
|
||||
// ============================================================================
|
||||
// RlvCommand
|
||||
//
|
||||
|
||||
Reference in New Issue
Block a user