Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git@github.com:Shyotl/SingularityViewer.git

Browse Source
This commit is contained in:
Shyotl
2018-02-08 03:25:32 -06:00
parent ce1b58dd13 410d2a83a2
commit 02865a9179
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llvoavatar.h
View File

@@ -1100,7 +1100,7 @@ protected: // Shared with LLVOAvatarSelf
public:
typedef std::array<F32, LL_MAX_JOINTS_PER_MESH_OBJECT * 12> rigged_matrix_array_t;
typedef std::vector<std::pair<LLUUID, std::pair<U32, rigged_matrix_array_t> > > rigged_transformation_cache_t;
auto& getRiggedMatrixCache()
rigged_transformation_cache_t& getRiggedMatrixCache()
{
return mRiggedMatrixDataCache;
}

2
indra/newview/shupdatechecker.cpp
View File

@@ -65,7 +65,7 @@ public:
return;
}
std::string viewer_version = llformat("%s (%i)", LLVersionInfo::getShortVersion(), LLVersionInfo::getBuild());
std::string viewer_version = llformat("%s (%i)", LLVersionInfo::getShortVersion().c_str(), LLVersionInfo::getBuild());
const Json::Value data = root[mType];
#if LL_WINDOWS