livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge vwr-dev-mat

meow-7.2.2
Graham Madarasz 2013-05-11 08:11:13 -07:00
parent e413f4b335 9b632f060b
commit a099815774
5 changed files with 23 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/llrender/llimagegl.cpp
View File

@ -624,7 +624,7 @@ void LLImageGL::setImage(const U8* data_in, BOOL data_hasmips)
{
is_compressed = true;
}
if (mUseMipMaps)
@ -772,6 +772,10 @@ void LLImageGL::setImage(const U8* data_in, BOOL data_hasmips)
else
{
S32 bytes = w * h * mComponents;
#ifdef SHOW_ASSERT
llassert(prev_mip_data);
llassert(cur_mip_size == bytes*4);
#endif
U8* new_data = new U8[bytes];
#ifdef SHOW_ASSERT

8
indra/lscript/lscript_compile/indra.l
View File

@ -79,17 +79,9 @@ void parse_string();
#define yyfree indra_free
#if LL_WINDOWS
#if defined(__cplusplus)
extern "C" { int yylex( void ); }
extern "C" { int yyparse( void ); }
extern "C" { int yyerror(const char *fmt, ...); }
#endif
#else
int yylex( void );
int yyparse( void );
int yyerror(const char *fmt, ...);
#endif
%}

12
indra/lscript/lscript_compile/indra.y
View File

@ -2,12 +2,6 @@
#include "linden_common.h"
#include "lscript_tree.h"
#if LL_WINDOWS
#ifdef __cplusplus
extern "C" {
#endif
#endif
int yylex(void);
int yyparse( void );
int yyerror(const char *fmt, ...);
@ -22,12 +16,6 @@
#pragma warning( disable : 4065 ) // warning: switch statement contains 'default' but no 'case' labels
#endif
#if LL_WINDOWS
#ifdef __cplusplus
}
#endif
#endif
%}
%union

28
indra/newview/llviewerobject.cpp
View File

@ -2714,25 +2714,25 @@ void LLViewerObject::processTaskInvFile(void** user_data, S32 error_code, LLExtS
if (object->loadTaskInvFile(ft->mFilename))
{
LLInventoryObject::object_list_t::iterator it = object->mInventory->begin();
LLInventoryObject::object_list_t::iterator end = object->mInventory->end();
std::list<LLUUID>& pending_lst = object->mPendingInventoryItemsIDs;
LLInventoryObject::object_list_t::iterator it = object->mInventory->begin();
LLInventoryObject::object_list_t::iterator end = object->mInventory->end();
std::list<LLUUID>& pending_lst = object->mPendingInventoryItemsIDs;
for (; it != end && pending_lst.size(); ++it)
{
LLViewerInventoryItem* item = dynamic_cast<LLViewerInventoryItem*>(it->get());
if(item && item->getType() != LLAssetType::AT_CATEGORY)
for (; it != end && pending_lst.size(); ++it)
{
std::list<LLUUID>::iterator id_it = std::find(pending_lst.begin(), pending_lst.begin(), item->getAssetUUID());
if (id_it != pending_lst.end())
LLViewerInventoryItem* item = dynamic_cast<LLViewerInventoryItem*>(it->get());
if(item && item->getType() != LLAssetType::AT_CATEGORY)
{
pending_lst.erase(id_it);
std::list<LLUUID>::iterator id_it = std::find(pending_lst.begin(), pending_lst.begin(), item->getAssetUUID());
if (id_it != pending_lst.end())
{
pending_lst.erase(id_it);
}
}
}
}
}
else
{
else
{
// MAINT-2597 - crash when trying to edit a no-mod object
// Somehow get an contents inventory response, but with an invalid stream (possibly 0 size?)
// Stated repro was specific to no-mod objects so failing without user interaction should be safe.
@ -4144,7 +4144,7 @@ S32 LLViewerObject::setTESpecularMapCore(const U8 te, LLViewerTexture *image)
if (mat)
{
mat->setSpecularID(uuid);
}
}
setChanged(TEXTURE);
if (mDrawable.notNull())
{

8
indra/newview/skins/default/xui/en/panel_tools_texture.xml
View File

@ -644,8 +644,8 @@
layout="topleft"
label_width="205"
left="10"
max_val="180"
min_val="-180"
max_val="9999"
min_val="-9999"
name="bumpyRot"
width="265" />
@ -707,8 +707,8 @@
layout="topleft"
label_width="205"
left="10"
max_val="180"
min_val="-180"
max_val="9999"
min_val="-9999"
name="shinyRot"
width="265" />