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

Browse Source 
# Conflicts:
#	indra/llcommon/llsd.cpp
#	indra/llcommon/llsdserialize.cpp
#	indra/newview/llspeakers.cpp
#	indra/newview/llviewermessage.cpp
This commit is contained in:
Liru Færs
2020-02-25 06:16:07 -05:00
parent 4f5749878f 25cb81221e
commit b08b597397
48 changed files with 305 additions and 411 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llvovolume.cpp
View File

@@ -2533,12 +2533,10 @@ void LLVOVolume::updateObjectMediaData(const LLSD &media_data_array, const std::
mLastFetchedMediaVersion = fetched_version;
//LL_INFOS() << "updating:" << this->getID() << " " << ll_pretty_print_sd(media_data_array) << LL_ENDL;
LLSD::array_const_iterator iter = media_data_array.beginArray();
LLSD::array_const_iterator end = media_data_array.endArray();
U8 texture_index = 0;
for (; iter != end; ++iter, ++texture_index)
for (auto const& entry : media_data_array.array())
{
syncMediaData(texture_index, *iter, false/*merge*/, false/*ignore_agent*/);
syncMediaData(texture_index++, entry, false/*merge*/, false/*ignore_agent*/);
}
}
}