diff --git a/autobuild.xml b/autobuild.xml index 90fabad19905607bd7e4324f9d9dee33aa4cfcbd..f8ba72fbc49b066ef1428db52ec4f5afe457527f 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -344,9 +344,9 @@ <key>archive</key> <map> <key>hash</key> - <string>5d0729b835d63b7fe69acdc6b7c60188</string> + <string>e78ecf919eee01567556787c3a358d15</string> <key>url</key> - <string>https://viewer.catznip.com/downloads/packages/colladadom-2.3.559710-windows-559710.tar.bz2</string> + <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/78637/744269/colladadom-2.3.557064-windows-557064.tar.bz2</string> </map> <key>name</key> <string>windows</string> @@ -356,9 +356,9 @@ <key>archive</key> <map> <key>hash</key> - <string>985e3081e41c76b6176d39e44d7fb4b8</string> + <string>7e63a212c8909a25236138422fe01298</string> <key>url</key> - <string>https://viewer.catznip.com/downloads/packages/colladadom-2.3.559710-windows64-559710.tar.bz2</string> + <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/78636/744273/colladadom-2.3.557064-windows64-557064.tar.bz2</string> </map> <key>name</key> <string>windows64</string> diff --git a/indra/newview/llfloater360capture.cpp b/indra/newview/llfloater360capture.cpp index ffbb0bbee9a062c9af631e0937e9b69192289feb..074ffabf11d872db57330d1eae3ac748c432ac1f 100644 --- a/indra/newview/llfloater360capture.cpp +++ b/indra/newview/llfloater360capture.cpp @@ -889,7 +889,10 @@ const std::string LLFloater360Capture::generate_proposed_filename() // this looks complex but it's straightforward - removes all non-alpha chars from a string // which in this case is the SL region name - we use it as a proposed filename but the user is free to change std::string region_name = region->getName(); - std::replace_if(region_name.begin(), region_name.end(), std::not1(std::ptr_fun(isalnum)), '_'); +// [SL:KB] - Patch: Viewer-Build | Checked: Catznip-6.6 + std::replace_if(region_name.begin(), region_name.end(), [](unsigned char ch) { return !isalnum(ch); }, '_'); +// [/SL:KB] +// std::replace_if(region_name.begin(), region_name.end(), std::not1(std::ptr_fun(isalnum)), '_'); if (region_name.length() > 0) { filename << region_name;