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

Merge branch 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer

master
Ansariel 2022-08-02 12:51:33 +02:00
parent b7d3cab3f2 eba7ae24dc
commit a0915f707d
5 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
indra/llappearance/llpolymesh.cpp
View File

@ -612,14 +612,16 @@ BOOL LLPolyMeshSharedData::loadMesh( const std::string& fileName )
// we reached the end of the morphs // we reached the end of the morphs
break; break;
} }
LLPolyMorphData* morph_data = new LLPolyMorphData(std::string(morphName)); std::string morph_name(morphName);
LLPolyMorphData* morph_data = new LLPolyMorphData(morph_name);
BOOL result = morph_data->loadBinary(fp, this); BOOL result = morph_data->loadBinary(fp, this);
if (!result) if (!result)
{ {
delete morph_data; LL_WARNS() << "Failure loading " << morph_name << " from " << fileName << LL_ENDL;
continue; delete morph_data;
continue;
} }
mMorphData.insert(morph_data); mMorphData.insert(morph_data);

4
indra/llappearance/llpolymorph.cpp
View File

@ -156,7 +156,9 @@ BOOL LLPolyMorphData::loadBinary(LLFILE *fp, LLPolyMeshSharedData *mesh)
if (mVertexIndices[v] > 10000) if (mVertexIndices[v] > 10000)
{ {
LL_ERRS() << "Bad morph index: " << mVertexIndices[v] << LL_ENDL; // Bad install? These are usually .llm files from 'character' fodler
LL_WARNS() << "Bad morph index " << v << ": " << mVertexIndices[v] << LL_ENDL;
return FALSE;
} }

11
indra/newview/llviewerparceloverlay.cpp
View File

@ -1092,13 +1092,14 @@ void LLViewerParcelOverlay::renderPropertyLinesOnMinimap(F32 scale_pixels_per_me
gGL.color4fv(parcel_outline_color); gGL.color4fv(parcel_outline_color);
for (S32 i = 0; i < GRIDS_PER_EDGE + 1; i++) for (S32 i = 0; i < GRIDS_PER_EDGE + 1; i++)
{ {
F32 bottom = region_bottom + (i * map_parcel_width); const F32 bottom = region_bottom + (i * map_parcel_width);
F32 top = bottom + map_parcel_width; const F32 top = bottom + map_parcel_width;
for (S32 j = 0; j < GRIDS_PER_EDGE + 1; j++) for (S32 j = 0; j < GRIDS_PER_EDGE + 1; j++)
{ {
F32 left = region_left + (j * map_parcel_width); const F32 left = region_left + (j * map_parcel_width);
F32 right = left + map_parcel_width; const F32 right = left + map_parcel_width;
U8 overlay = mOwnership[(i * GRIDS_PER_EDGE) + j]; const bool is_region_boundary = i == GRIDS_PER_EDGE || j == GRIDS_PER_EDGE;
const U8 overlay = is_region_boundary ? 0 : mOwnership[(i * GRIDS_PER_EDGE) + j];
// The property line vertices are three-dimensional, but here we only care about the x and y coordinates, as we are drawing on a // The property line vertices are three-dimensional, but here we only care about the x and y coordinates, as we are drawing on a
// 2D map // 2D map
const bool has_left = i != GRIDS_PER_EDGE && (j == GRIDS_PER_EDGE || (overlay & PARCEL_WEST_LINE)); const bool has_left = i != GRIDS_PER_EDGE && (j == GRIDS_PER_EDGE || (overlay & PARCEL_WEST_LINE));

7
indra/newview/llviewerwindow.cpp
View File

@ -2802,10 +2802,11 @@ void LLViewerWindow::reshape(S32 width, S32 height)
//glViewport(0, 0, width, height ); //glViewport(0, 0, width, height );
if (height > 0) LLViewerCamera * camera = LLViewerCamera::getInstance(); // simpleton, might not exist
if (height > 0 && camera)
{ {
LLViewerCamera::getInstance()->setViewHeightInPixels( mWorldViewRectRaw.getHeight() ); camera->setViewHeightInPixels( mWorldViewRectRaw.getHeight() );
LLViewerCamera::getInstance()->setAspect( getWorldViewAspectRatio() ); camera->setAspect( getWorldViewAspectRatio() );
} }
calcDisplayScale(); calcDisplayScale();

9
indra/newview/llvoicevivox.cpp
View File

@ -1741,7 +1741,14 @@ bool LLVivoxVoiceClient::requestParcelVoiceInfo()
} }
else else
{ {
LL_WARNS("Voice") << "No voice credentials" << LL_ENDL; if (LLViewerParcelMgr::getInstance()->allowAgentVoice())
{
LL_WARNS("Voice") << "No voice credentials" << LL_ENDL;
}
else
{
LL_DEBUGS("Voice") << "No voice credentials" << LL_ENDL;
}
} }
// set the spatial channel. If no voice credentials or uri are // set the spatial channel. If no voice credentials or uri are