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

Merge branch 'DRTVWR-489' of https://github.com/secondlife/viewer 

# Conflicts:
#	autobuild.xml
#	indra/llcommon/CMakeLists.txt
#	indra/newview/CMakeLists.txt
master
Ansariel 2023-04-05 11:56:57 +02:00
parent 9825c45335 68612324b8
commit 256157eba8
21 changed files with 16 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
autobuild.xml
View File

@ -724,9 +724,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>b923ca041271446592b3b10e678b93b6</string>
<string>df05eee28649996c78a47dd054de2a47</string>
<key>url</key>
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/109517/952832/colladadom-2.3.577706-darwin64-577706.tar.bz2</string>
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/112764/977018/colladadom-2.3.579218-darwin64-579218.tar.bz2</string>
</map>
<key>name</key>
<string>darwin64</string>
@ -748,9 +748,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>26f3e24adbd0bbb6ed002f5eb61c64ab</string>
<string>6752b4f098a522bb22b6334cdfba7614</string>
<key>url</key>
<string>https://3p.firestormviewer.org/colladadom-2.3.230231147-windows-230231147.tar.bz2</string>
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/112771/977087/colladadom-2.3.579224-windows-579224.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@ -760,16 +760,16 @@
<key>archive</key>
<map>
<key>hash</key>
<string>231a7ce499126806e051490d81591fec</string>
<string>81de6dc4a79b547a25d0040370c42fec</string>
<key>url</key>
<string>https://3p.firestormviewer.org/colladadom-2.3.230231451-windows64-230231451.tar.bz2</string>
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/112770/977082/colladadom-2.3.579224-windows64-579224.tar.bz2</string>
</map>
<key>name</key>
<string>windows64</string>
</map>
</map>
<key>version</key>
<string>2.3.577706</string>
<string>2.3.579218</string>
</map>
<key>cubemaptoequirectangular</key>
<map>
@ -1512,9 +1512,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>dc09e870c8419979d748855c2d956711</string>
<string>acc2484ff03dfaf7652cac9f42ce198a</string>
<key>url</key>
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/109675/954163/icu4c-4.8.1-darwin64-577789.tar.bz2</string>
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/112891/977803/icu4c-4.8.1-darwin64-579276.tar.bz2</string>
</map>
<key>name</key>
<string>darwin64</string>
@ -1524,9 +1524,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>08749d1f7f0a96b1951eecdae5dc11ba</string>
<string>d88003ff2c3c9145bc2c7d2d2f80f9b1</string>
<key>url</key>
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/109679/954178/icu4c-4.8.1-windows-577789.tar.bz2</string>
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/112892/977809/icu4c-4.8.1-windows-579276.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@ -1536,9 +1536,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>98bca5c137e6d47c5b57827e156b1857</string>
<string>2cdc400727294edcc144558d4f94fd00</string>
<key>url</key>
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/109678/954182/icu4c-4.8.1-windows64-577789.tar.bz2</string>
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/112893/977815/icu4c-4.8.1-windows64-579276.tar.bz2</string>
</map>
<key>name</key>
<string>windows64</string>
@ -3137,16 +3137,6 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>name</key>
<string>windows64</string>
</map>
<key>linux64</key>
<map>
<key>archive</key>
<map>
<key>hash</key>
<string>46edf0f55417f8ef0d33a5c007bc3644</string>
<key>url</key>
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/89310/815451/threejs-0.132.2-windows64-564843.tar.bz2</string>
</map>
</map>
</map>
<key>version</key>
<string>0.132.2</string>

2
indra/llcharacter/llbvhloader.cpp
View File

@ -1374,7 +1374,6 @@ BOOL LLBVHLoader::serialize(LLDataPacker& dp)
dp.packS32(joint->mNumRotKeys, "num_rot_keys");
LLQuaternion::Order order = bvhStringToOrder( joint->mOrder );
S32 outcount = 0;
S32 frame = 0;
for ( ki = joint->mKeys.begin();
ki != joint->mKeys.end();
@ -1442,7 +1441,6 @@ BOOL LLBVHLoader::serialize(LLDataPacker& dp)
dp.packU16(x, "rot_angle_x");
dp.packU16(y, "rot_angle_y");
dp.packU16(z, "rot_angle_z");
outcount++;
frame++;
}

2
indra/llcommon/CMakeLists.txt
View File

@ -303,6 +303,7 @@ endif(NOT WORD_SIZE EQUAL 32)
target_link_libraries(
llcommon
ll::icu4c
ll::apr
ll::expat
ll::jsoncpp
@ -311,7 +312,6 @@ target_link_libraries(
ll::uriparser
ll::oslibraries
ll::tracy
ll::icu4c
)
target_include_directories(llcommon INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})

2
indra/llcommon/llerrorthread.cpp
View File

@ -110,11 +110,9 @@ void LLErrorThread::run()
// <FS:ND/> Do not log as this can lead to deadlocks during startup.
// LL_INFOS() << "thread_error - Waiting for an error" << LL_ENDL;
S32 counter = 0;
while (! (LLApp::isError() || LLApp::isStopped()))
{
ms_sleep(10);
counter++;
}
if (LLApp::isError())
{

2
indra/llmath/llvolume.cpp
View File

@ -5744,14 +5744,12 @@ bool LLVolumeFace::cacheOptimize()
new_indices.push_back(tri->mVertex[2]->mIdx);
tri->complete();
U32 breaks = 0;
for (U32 i = 1; i < mNumIndices/3; ++i)
{
cache.updateScores();
tri = cache.mBestTriangle;
if (!tri)
{
breaks++;
for (U32 j = 0; j < triangle_data.size(); ++j)
{
if (triangle_data[j].mActive)

2
indra/llmessage/llcircuit.cpp
View File

@ -278,7 +278,6 @@ void LLCircuitData::ackReliablePacket(TPACKETID packet_num)
S32 LLCircuitData::resendUnackedPackets(const F64Seconds now)
{
S32 resent_packets = 0;
LLReliablePacket *packetp;
@ -382,7 +381,6 @@ S32 LLCircuitData::resendUnackedPackets(const F64Seconds now)
// Don't remove it yet, it still gets to try to resend at least once.
++iter;
}
resent_packets++;
}
else
{

2
indra/llrender/llgl.cpp
View File

@ -2333,8 +2333,6 @@ void LLGLSyncFence::wait()
{
while (glClientWaitSync(mSync, 0, FENCE_WAIT_TIME_NANOSECONDS) == GL_TIMEOUT_EXPIRED)
{ //track the number of times we've waited here
static S32 waits = 0;
waits++;
}
}
#endif

3
indra/llui/llbutton.cpp
View File

@ -1008,11 +1008,8 @@ void LLButton::draw()
break;
}
S32 y_offset = 2 + (getRect().getHeight() - 20)/2;
if (pressed && mDisplayPressedState)
{
y_offset--;
x++;
}

3
indra/llui/llmenugl.cpp
View File

@ -508,9 +508,6 @@ void LLMenuItemGL::draw( void )
// let disabled items be highlighted, just don't draw them as such
if( getEnabled() && getHighlight() && !mBriefItem)
{
int debug_count = 0;
if (dynamic_cast<LLMenuItemCallGL*>(this))
debug_count++;
gGL.color4fv( mHighlightBackground.get().mV );
gl_rect_2d( 0, getRect().getHeight(), getRect().getWidth(), 0 );

4
indra/llxml/llcontrol.cpp
View File

@ -876,7 +876,6 @@ U32 LLControlGroup::loadFromFileLegacy(const std::string& filename, BOOL require
return 0;
}
U32 item = 0;
U32 validitems = 0;
S32 version;
@ -909,9 +908,6 @@ U32 LLControlGroup::loadFromFileLegacy(const std::string& filename, BOOL require
continue;
}
// Got an item. Load it up.
item++;
// If not declared, assume it's a string
if (!declared)
{

2
indra/newview/llagent.cpp
View File

@ -4433,7 +4433,6 @@ void LLAgent::processScriptControlChange(LLMessageSystem *msg, void **)
// take controls
msg->getU32("Data", "Controls", controls, block_index );
msg->getBOOL("Data", "PassToAgent", passon, block_index );
U32 total_count = 0;
for (i = 0; i < TOTAL_CONTROLS; i++)
{
if (controls & ( 1 << i))
@ -4446,7 +4445,6 @@ void LLAgent::processScriptControlChange(LLMessageSystem *msg, void **)
{
gAgent.mControlsTakenCount[i]++;
}
total_count++;
}
}
}

5
indra/newview/llmodelpreview.cpp
View File

@ -3681,9 +3681,6 @@ void LLModelPreview::clearBuffers()
void LLModelPreview::genBuffers(S32 lod, bool include_skin_weights)
{
U32 mesh_count = 0;
LLModelLoader::model_list* model = NULL;
if (lod < 0 || lod > 4)
@ -3818,8 +3815,6 @@ void LLModelPreview::genBuffers(S32 lod, bool include_skin_weights)
vb->flush();
mVertexBuffer[lod][mdl].push_back(vb);
++mesh_count;
}
}
}

4
indra/newview/llpanelnearbymedia.cpp
View File

@ -632,7 +632,6 @@ void LLPanelNearByMedia::refreshList()
LLViewerMedia::impl_list impls = media_inst->getPriorityList();
LLViewerMedia::impl_list::iterator priority_iter;
U32 enabled_count = 0;
U32 disabled_count = 0;
// iterate over the impl list, creating rows as necessary.
@ -675,10 +674,7 @@ void LLPanelNearByMedia::refreshList()
{
disabled_count++;
}
else {
enabled_count++;
}
}
}
mDisableAllCtrl->setEnabled((gSavedSettings.getBOOL("AudioStreamingMusic") ||
gSavedSettings.getBOOL("AudioStreamingMedia")) &&

4
indra/newview/llsceneview.cpp
View File

@ -104,9 +104,6 @@ void LLSceneView::draw()
std::vector<F32> physics_cost[2];
F32 total_physics[] = { 0.f, 0.f };
U32 object_count = 0;
LLViewerRegion* region = gAgent.getRegion();
if (region)
{
@ -121,7 +118,6 @@ void LLSceneView::draw()
U32 idx = object->isAttachment() ? 1 : 0;
LLVolume* volume = object->getVolume();
object_count++;
F32 radius = object->getScale().magVec();
size[idx].push_back(radius);

7
indra/newview/llselectmgr.cpp
View File

@ -5450,9 +5450,6 @@ void LLSelectMgr::sendListToRegions(LLObjectSelectionHandle selected_handle,
LLSelectNode* linkset_root = NULL;
LLViewerRegion* last_region;
LLViewerRegion* current_region;
S32 objects_sent = 0;
S32 packets_sent = 0;
S32 objects_in_this_packet = 0;
bool link_operation = message_name == "ObjectLink";
@ -5584,7 +5581,6 @@ void LLSelectMgr::sendListToRegions(LLObjectSelectionHandle selected_handle,
(*pack_body)(node, user_data);
// do any related logging
(*log_func)(node, user_data);
++objects_sent;
++objects_in_this_packet;
// and on to the next object
@ -5602,7 +5598,6 @@ void LLSelectMgr::sendListToRegions(LLObjectSelectionHandle selected_handle,
{
// otherwise send current message and start new one
gMessageSystem->sendReliable( last_region->getHost());
packets_sent++;
objects_in_this_packet = 0;
gMessageSystem->newMessage(message_name.c_str());
@ -5619,7 +5614,6 @@ void LLSelectMgr::sendListToRegions(LLObjectSelectionHandle selected_handle,
{
// add root instance into new message
(*pack_body)(linkset_root, user_data);
++objects_sent;
++objects_in_this_packet;
}
}
@ -5633,7 +5627,6 @@ void LLSelectMgr::sendListToRegions(LLObjectSelectionHandle selected_handle,
if (gMessageSystem->getCurrentSendTotal() > 0)
{
gMessageSystem->sendReliable( current_region->getHost());
packets_sent++;
}
else
{

5
indra/newview/llsprite.cpp
View File

@ -79,7 +79,6 @@ void LLSprite::updateFace(LLFace &face)
// First, figure out how many vertices/indices we need.
U32 num_vertices, num_indices;
U32 vertex_count = 0;
// Get the total number of vertices and indices
if (mFollow)
@ -203,25 +202,21 @@ void LLSprite::updateFace(LLFace &face)
*verticesp = mC;
tex_coordsp++;
verticesp++;
vertex_count++;
*tex_coordsp = LLVector2(0.f, 1.f);
*verticesp = mB;
tex_coordsp++;
verticesp++;
vertex_count++;
*tex_coordsp = LLVector2(1.f, 1.f);
*verticesp = mA;
tex_coordsp++;
verticesp++;
vertex_count++;
*tex_coordsp = LLVector2(1.f, 0.0f);
*verticesp = mD;
tex_coordsp++;
verticesp++;
vertex_count++;
// Generate indices, since they're easy.
// Just a series of quads.

2
indra/newview/llstartup.cpp
View File

@ -4211,7 +4211,7 @@ LLSD transform_cert_args(LLPointer<LLCertificate> cert)
// are actually arrays, and we want to format them as comma separated
// strings, so special case those.
LLSDSerialize::toXML(cert_info[iter->first], std::cout);
if((iter->first== std::string(CERT_KEY_USAGE)) |
if((iter->first== std::string(CERT_KEY_USAGE)) ||
(iter->first == std::string(CERT_EXTENDED_KEY_USAGE)))
{
value = "";

2
indra/newview/lltextureview.cpp
View File

@ -981,8 +981,6 @@ void LLTextureView::draw()
if (imagep->getID() == LLAppViewer::getTextureFetch()->mDebugID)
{
static S32 debug_count = 0;
++debug_count; // for breakpoints
}
F32 pri;

3
indra/newview/llviewerobjectlist.cpp
View File

@ -862,7 +862,6 @@ void LLViewerObjectList::setAllObjectDefaultTextures(U32 nChannel, bool fShowDef
void LLViewerObjectList::updateApparentAngles(LLAgent &agent)
{
S32 i;
S32 num_objects = 0;
LLViewerObject *objectp;
S32 num_updates, max_value;
@ -919,8 +918,6 @@ void LLViewerObjectList::updateApparentAngles(LLAgent &agent)
objectp = mObjects[i];
if (!objectp->isDead())
{
num_objects++;
// Update distance & gpw
objectp->setPixelAreaAndAngle(agent); // Also sets the approx. pixel area
objectp->updateTextures(); // Update the image levels of textures for this object.

7
indra/newview/llvosurfacepatch.cpp
View File

@ -408,7 +408,6 @@ void LLVOSurfacePatch::updateNorthGeometry(LLFace *facep,
LLStrider<U16> &indicesp,
U32 &index_offset)
{
S32 vertex_count = 0;
S32 i, x, y;
S32 num_vertices;
@ -443,7 +442,6 @@ void LLVOSurfacePatch::updateNorthGeometry(LLFace *facep,
normalsp++;
texCoords0p++;
texCoords1p++;
vertex_count++;
}
// North patch
@ -456,7 +454,6 @@ void LLVOSurfacePatch::updateNorthGeometry(LLFace *facep,
normalsp++;
texCoords0p++;
texCoords1p++;
vertex_count++;
}
@ -493,7 +490,6 @@ void LLVOSurfacePatch::updateNorthGeometry(LLFace *facep,
normalsp++;
texCoords0p++;
texCoords1p++;
vertex_count++;
}
// Iterate through the north patch's points
@ -507,7 +503,6 @@ void LLVOSurfacePatch::updateNorthGeometry(LLFace *facep,
normalsp++;
texCoords0p++;
texCoords1p++;
vertex_count++;
}
@ -551,7 +546,6 @@ void LLVOSurfacePatch::updateNorthGeometry(LLFace *facep,
normalsp++;
texCoords0p++;
texCoords1p++;
vertex_count++;
}
// Iterate through the north patch's points
@ -565,7 +559,6 @@ void LLVOSurfacePatch::updateNorthGeometry(LLFace *facep,
normalsp++;
texCoords0p++;
texCoords1p++;
vertex_count++;
}
for (i = 0; i < length; i++)

13
indra/newview/llvovolume.cpp
View File

@ -6645,7 +6645,6 @@ U32 LLVolumeGeometryManager::genDrawInfo(LLSpatialGroup* group, U32 mask, LLFace
LLSpatialGroup::buffer_map_t buffer_map;
LLViewerTexture* last_tex = NULL;
S32 buffer_index = 0;
S32 texture_index_channels = 1;
@ -6659,11 +6658,6 @@ U32 LLVolumeGeometryManager::genDrawInfo(LLSpatialGroup* group, U32 mask, LLFace
texture_index_channels = gDeferredAlphaProgram.mFeatures.mIndexedTextureChannels;
}
if (distance_sort)
{
buffer_index = -1;
}
static LLCachedControl<U32> max_texture_index(gSavedSettings, "RenderMaxTextureIndex", 16);
texture_index_channels = llmin(texture_index_channels, (S32) max_texture_index);
@ -6686,14 +6680,9 @@ U32 LLVolumeGeometryManager::genDrawInfo(LLSpatialGroup* group, U32 mask, LLFace
// tex = NULL;
// }
if (last_tex == tex)
{
buffer_index++;
}
else
if (last_tex != tex)
{
last_tex = tex;
buffer_index = 0;
}
bool bake_sunlight = LLPipeline::sBakeSunlight && facep->getDrawable()->isStatic();