History

Merge branch 'master' of https://github.com/highfidelity/hifi into body_not_rotating

Atlante45 committed 11 years ago

Commit 74d819f2 parents 80af2ad 60aafba10 files · +88 −68Browse files

Showing the changes to libraries/render-utils/src/GeometryCache.cpp (1 of 10 files). Show all

Unified · Split

libraries/render-utils/src/GeometryCache.cpp+2−2
@@ -1873,9 +1873,9 @@ void GeometryReader::run() { · 1872 unmodified lines
18731873 if (!_reply) {
18741874 throw QString("Reply is NULL ?!");
18751875 }
1876− std::string urlname = _url.path().toLower().toStdString();
1876+ QString urlname = _url.path().toLower();
18771877 bool urlValid = true;
1878− urlValid &= !urlname.empty();
1878+ urlValid &= !urlname.isEmpty();
18791879 urlValid &= !_url.path().isEmpty();
18801880 urlValid &= _url.path().toLower().endsWith(".fbx")
18811881 || _url.path().toLower().endsWith(".svo");