Fixup merge diffs
Graham Madarasz
parent
6074f65991
commit
e413f4b335
|
|
@ -647,6 +647,7 @@ Jonathan Yap
|
|||
STORM-1872
|
||||
STORM-1858
|
||||
STORM-1862
|
||||
OPEN-161
|
||||
Kadah Coba
|
||||
STORM-1060
|
||||
STORM-1843
|
||||
|
|
@ -1168,6 +1169,7 @@ Techwolf Lupindo
|
|||
SNOW-746
|
||||
VWR-12385
|
||||
VWR-20893
|
||||
OPEN-161
|
||||
Templar Merlin
|
||||
tenebrous pau
|
||||
VWR-247
|
||||
|
|
|
|||
|
|
@ -1257,7 +1257,6 @@ BOOL LLPrimitive::packTEMessage(LLDataPacker &dp) const
|
|||
S32 LLPrimitive::parseTEMessage(LLMessageSystem* mesgsys, char const* block_name, const S32 block_num, LLTEContents& tec)
|
||||
{
|
||||
S32 retval = 0;
|
||||
|
||||
// temp buffer for material ID processing
|
||||
// data will end up in tec.material_id[]
|
||||
U8 material_data[LLTEContents::MAX_TES*16];
|
||||
|
|
|
|||
|
|
@ -392,7 +392,6 @@ public:
|
|||
S32 unpackTEField(U8 *cur_ptr, U8 *buffer_end, U8 *data_ptr, U8 data_size, U8 face_count, EMsgVariableType type);
|
||||
BOOL packTEMessage(LLMessageSystem *mesgsys) const;
|
||||
BOOL packTEMessage(LLDataPacker &dp) const;
|
||||
S32 unpackTEMessage(LLMessageSystem* mesgsys, char const* block_name);
|
||||
S32 unpackTEMessage(LLMessageSystem* mesgsys, char const* block_name, const S32 block_num); // Variable num of blocks
|
||||
BOOL unpackTEMessage(LLDataPacker &dp);
|
||||
S32 parseTEMessage(LLMessageSystem* mesgsys, char const* block_name, const S32 block_num, LLTEContents& tec);
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
project(llrender)
|
||||
|
||||
include(00-Common)
|
||||
include(FindOpenGL)
|
||||
include(OpenGL)
|
||||
include(FreeType)
|
||||
include(LLCommon)
|
||||
include(LLImage)
|
||||
|
|
|
|||
|
|
@ -38,10 +38,9 @@ class LLTexUnit ;
|
|||
class LLFontGL ;
|
||||
|
||||
//
|
||||
//this is an abstract class as the parent for the class LLViewerTexture
|
||||
//through the following virtual functions, the class LLViewerTexture can be reached from /llrender.
|
||||
//this is an abstract class as the parent for the class LLGLTexture
|
||||
//
|
||||
class LLTexture : public LLRefCount
|
||||
class LLTexture : public virtual LLRefCount
|
||||
{
|
||||
friend class LLTexUnit ;
|
||||
friend class LLFontGL ;
|
||||
|
|
@ -53,7 +52,7 @@ public:
|
|||
LLTexture(){}
|
||||
|
||||
//
|
||||
//interfaces to access LLViewerTexture
|
||||
//interfaces to access LLGLTexture
|
||||
//
|
||||
virtual S8 getType() const = 0 ;
|
||||
virtual void setKnownDrawSize(S32 width, S32 height) = 0 ;
|
||||
|
|
|
|||
|
|
@ -1859,17 +1859,6 @@ target_link_libraries(${VIEWER_BINARY_NAME}
|
|||
${LLAPPEARANCE_LIBRARIES}
|
||||
)
|
||||
|
||||
if (USE_KDU)
|
||||
target_link_libraries(${VIEWER_BINARY_NAME}
|
||||
${LLKDU_LIBRARIES}
|
||||
${KDU_LIBRARY}
|
||||
)
|
||||
else (USE_KDU)
|
||||
target_link_libraries(${VIEWER_BINARY_NAME}
|
||||
${LLIMAGEJ2COJ_LIBRARIES}
|
||||
)
|
||||
endif (USE_KDU)
|
||||
|
||||
build_version(viewer)
|
||||
|
||||
set(ARTWORK_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE PATH
|
||||
|
|
@ -2088,6 +2077,15 @@ if (LL_TESTS)
|
|||
llworldmipmap.cpp
|
||||
)
|
||||
|
||||
set_source_files_properties(
|
||||
llworldmap.cpp
|
||||
llworldmipmap.cpp
|
||||
PROPERTIES
|
||||
LL_TEST_ADDITIONAL_SOURCE_FILES
|
||||
tests/llviewertexture_stub.cpp
|
||||
#llviewertexturelist.cpp
|
||||
)
|
||||
|
||||
set_source_files_properties(
|
||||
lltranslate.cpp
|
||||
PROPERTIES
|
||||
|
|
|
|||
|
|
@ -1084,7 +1084,7 @@
|
|||
scale="0 0 .5" />
|
||||
</param_skeleton>
|
||||
</param>
|
||||
<param
|
||||
<param
|
||||
id="11001"
|
||||
group="0"
|
||||
name="Hover"
|
||||
|
|
|
|||
|
|
@ -1783,6 +1783,8 @@ bool LLAppViewer::cleanup()
|
|||
|
||||
LLAvatarAppearance::cleanupClass();
|
||||
|
||||
LLAvatarAppearance::cleanupClass();
|
||||
|
||||
LLPostProcess::cleanupClass();
|
||||
|
||||
LLTracker::cleanupInstance();
|
||||
|
|
@ -3589,6 +3591,12 @@ void LLAppViewer::requestQuit()
|
|||
gAgentAvatarp->updateAvatarRezMetrics(true); // force a last packet to be sent.
|
||||
}
|
||||
|
||||
// Try to send last batch of avatar rez metrics.
|
||||
if (!gDisconnected && isAgentAvatarValid())
|
||||
{
|
||||
gAgentAvatarp->updateAvatarRezMetrics(true); // force a last packet to be sent.
|
||||
}
|
||||
|
||||
LLHUDEffectSpiral *effectp = (LLHUDEffectSpiral*)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_POINT, TRUE);
|
||||
effectp->setPositionGlobal(gAgent.getPositionGlobal());
|
||||
effectp->setColor(LLColor4U(gAgent.getEffectColor()));
|
||||
|
|
|
|||
|
|
@ -594,8 +594,8 @@ void LLFace::renderSelected(LLViewerTexture *imagep, const LLColor4& color)
|
|||
/* removed in lieu of raycast uv detection
|
||||
void LLFace::renderSelectedUV()
|
||||
{
|
||||
LLViewerTexture* red_blue_imagep = LLViewerTextureManager::getFetchedTextureFromFile("uv_test1.j2c", TRUE, LLViewerTexture::BOOST_UI);
|
||||
LLViewerTexture* green_imagep = LLViewerTextureManager::getFetchedTextureFromFile("uv_test2.tga", TRUE, LLViewerTexture::BOOST_UI);
|
||||
LLViewerTexture* red_blue_imagep = LLViewerTextureManager::getFetchedTextureFromFile("uv_test1.j2c", TRUE, LLGLTexture::BOOST_UI);
|
||||
LLViewerTexture* green_imagep = LLViewerTextureManager::getFetchedTextureFromFile("uv_test2.tga", TRUE, LLGLTexture::BOOST_UI);
|
||||
|
||||
LLGLSUVSelect object_select;
|
||||
|
||||
|
|
|
|||
|
|
@ -1097,6 +1097,7 @@ void LLViewerFetchedTexture::loadFromFastCache()
|
|||
{
|
||||
//discard all oversized textures.
|
||||
destroyRawImage();
|
||||
llwarns << "oversized, setting as missing" << llendl;
|
||||
setIsMissingAsset();
|
||||
mRawDiscardLevel = INVALID_DISCARD_LEVEL ;
|
||||
}
|
||||
|
|
@ -1368,6 +1369,7 @@ BOOL LLViewerFetchedTexture::createTexture(S32 usename/*= 0*/)
|
|||
// An inappropriately-sized image was uploaded (through a non standard client)
|
||||
// We treat these images as missing assets which causes them to
|
||||
// be renderd as 'missing image' and to stop requesting data
|
||||
llwarns << "!size_ok, setting as missing" << llendl;
|
||||
setIsMissingAsset();
|
||||
destroyRawImage();
|
||||
return FALSE;
|
||||
|
|
|
|||
|
|
@ -24,12 +24,6 @@
|
|||
* $/LicenseInfo$
|
||||
*/
|
||||
|
||||
#if LL_MSVC
|
||||
// disable warning about boost::lexical_cast returning uninitialized data
|
||||
// when it fails to parse the string
|
||||
#pragma warning (disable:4701)
|
||||
#endif
|
||||
|
||||
#include "llviewerprecompiledheaders.h"
|
||||
|
||||
#include "llvoavatar.h"
|
||||
|
|
@ -113,12 +107,6 @@ extern F32 SPEED_ADJUST_MAX_SEC;
|
|||
extern F32 ANIM_SPEED_MAX;
|
||||
extern F32 ANIM_SPEED_MIN;
|
||||
|
||||
#if LL_MSVC
|
||||
// disable boost::lexical_cast warning
|
||||
#pragma warning (disable:4702)
|
||||
#endif
|
||||
|
||||
#include <boost/lexical_cast.hpp>
|
||||
|
||||
// #define OUTPUT_BREAST_DATA
|
||||
|
||||
|
|
@ -199,8 +187,6 @@ const F32 NAMETAG_UPDATE_THRESHOLD = 0.3f;
|
|||
const F32 NAMETAG_VERTICAL_SCREEN_OFFSET = 25.f;
|
||||
const F32 NAMETAG_VERT_OFFSET_WEIGHT = 0.17f;
|
||||
|
||||
const LLColor4 DUMMY_COLOR = LLColor4(0.5,0.5,0.5,1.0);
|
||||
|
||||
enum ERenderName
|
||||
{
|
||||
RENDER_NAME_NEVER,
|
||||
|
|
@ -276,6 +262,8 @@ struct LLVOAvatarChildJoint : public LLInitParam::ChoiceBlock<LLVOAvatarChildJoi
|
|||
{}
|
||||
};
|
||||
|
||||
|
||||
|
||||
struct LLVOAvatarBoneInfo : public LLInitParam::Block<LLVOAvatarBoneInfo, LLVOAvatarCollisionVolumeInfo>
|
||||
{
|
||||
LLVOAvatarBoneInfo()
|
||||
|
|
@ -305,6 +293,8 @@ struct LLVOAvatarSkeletonInfo : public LLInitParam::Block<LLVOAvatarSkeletonInfo
|
|||
Mandatory<LLVOAvatarChildJoint> skeleton_root;
|
||||
};
|
||||
|
||||
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// class LLBodyNoiseMotion
|
||||
//-----------------------------------------------------------------------------
|
||||
|
|
@ -5853,6 +5843,8 @@ BOOL LLVOAvatar::isWearingWearableType(LLWearableType::EType type) const
|
|||
|
||||
|
||||
|
||||
|
||||
|
||||
// virtual
|
||||
void LLVOAvatar::invalidateComposite( LLTexLayerSet* layerset, BOOL upload_result )
|
||||
{
|
||||
|
|
@ -6486,6 +6478,7 @@ void LLVOAvatar::applyMorphMask(U8* tex_data, S32 width, S32 height, S32 num_com
|
|||
}
|
||||
|
||||
|
||||
|
||||
// returns TRUE if morph masks are present and not valid for a given baked texture, FALSE otherwise
|
||||
BOOL LLVOAvatar::morphMaskNeedsUpdate(LLAvatarAppearanceDefines::EBakedTextureIndex index)
|
||||
{
|
||||
|
|
@ -7393,6 +7386,10 @@ void LLVOAvatar::dumpArchetypeXML(const std::string& prefix, bool group_by_weara
|
|||
}
|
||||
if (outprefix.empty())
|
||||
{
|
||||
outprefix = getFullname() + (isSelf()?"_s":"_o");
|
||||
}
|
||||
if (outprefix.empty())
|
||||
{
|
||||
outprefix = std::string("new_archetype");
|
||||
}
|
||||
std::string outfilename = get_sequential_numbered_file_name(outprefix,".xml");
|
||||
|
|
@ -7458,7 +7455,6 @@ void LLVOAvatar::dumpArchetypeXML(const std::string& prefix, bool group_by_weara
|
|||
|
||||
for (U8 te = 0; te < TEX_NUM_INDICES; te++)
|
||||
{
|
||||
{
|
||||
// MULTIPLE_WEARABLES: extend to multiple wearables?
|
||||
LLViewerTexture* te_image = getImage((ETextureIndex)te, 0);
|
||||
if( te_image )
|
||||
|
|
@ -7470,7 +7466,6 @@ void LLVOAvatar::dumpArchetypeXML(const std::string& prefix, bool group_by_weara
|
|||
}
|
||||
}
|
||||
|
||||
}
|
||||
apr_file_printf( file, "\t</archetype>\n" );
|
||||
apr_file_printf( file, "\n</linden_genepool>\n" );
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue