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

Merge with Firestorm LGPL tip

Ansariel 2013-03-09 15:56:31 +01:00
parent b2770529b4 0f6a6582c9
commit 6bbd5d01fb
146 changed files with 1452 additions and 677 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
autobuild.xml
View File

@ -1814,7 +1814,7 @@
<key>hash</key>
<string>2fbd3c2523c45923245b55551fae5e53</string>
<key>url</key>
<string>http://viewer.catznip.com/downloads/openjpeg-1.4-windows-20110622.tar.bz2</string>
<string>http://downloads.phoenixviewer.com/openjpeg-1.4-windows-20110622.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>

2
indra/llcommon/llmetricperformancetester.cpp
View File

@ -100,7 +100,7 @@ LLSD LLMetricPerformanceTesterBasic::analyzeMetricPerformanceLog(std::istream& i
LLSD ret;
LLSD cur;
while (!is.eof() && LLSDSerialize::fromXML(cur, is))
while (!is.eof() && LLSDParser::PARSE_FAILURE != LLSDSerialize::fromXML(cur, is))
{
for (LLSD::map_iterator iter = cur.beginMap(); iter != cur.endMap(); ++iter)
{

16
indra/llcommon/llsdserialize.h
View File

@ -300,7 +300,7 @@ public:
/**
* @brief Constructor
*/
LLSDXMLParser();
LLSDXMLParser(bool emit_errors=true);
protected:
/**
@ -747,25 +747,25 @@ public:
return f->format(sd, str, LLSDFormatter::OPTIONS_PRETTY);
}
static S32 fromXMLEmbedded(LLSD& sd, std::istream& str)
static S32 fromXMLEmbedded(LLSD& sd, std::istream& str, bool emit_errors=true)
{
// no need for max_bytes since xml formatting is not
// subvertable by bad sizes.
LLPointer<LLSDXMLParser> p = new LLSDXMLParser;
LLPointer<LLSDXMLParser> p = new LLSDXMLParser(emit_errors);
return p->parse(str, sd, LLSDSerialize::SIZE_UNLIMITED);
}
// Line oriented parser, 30% faster than fromXML(), but can
// only be used when you know you have the complete XML
// document available in the stream.
static S32 fromXMLDocument(LLSD& sd, std::istream& str)
static S32 fromXMLDocument(LLSD& sd, std::istream& str, bool emit_errors=true)
{
LLPointer<LLSDXMLParser> p = new LLSDXMLParser();
LLPointer<LLSDXMLParser> p = new LLSDXMLParser(emit_errors);
return p->parseLines(str, sd);
}
static S32 fromXML(LLSD& sd, std::istream& str)
static S32 fromXML(LLSD& sd, std::istream& str, bool emit_errors=true)
{
return fromXMLEmbedded(sd, str);
// return fromXMLDocument(sd, str);
return fromXMLEmbedded(sd, str, emit_errors);
// return fromXMLDocument(sd, str, emit_errors);
}
/*

18
indra/llcommon/llsdserialize_xml.cpp
View File

@ -251,7 +251,7 @@ std::string LLSDXMLFormatter::escapeString(const std::string& in)
class LLSDXMLParser::Impl
{
public:
Impl();
Impl(bool emit_errors);
~Impl();
S32 parse(std::istream& input, LLSD& data);
@ -295,6 +295,7 @@ private:
static const XML_Char* findAttribute(const XML_Char* name, const XML_Char** pairs);
bool mEmitErrors;
XML_Parser mParser;
@ -317,7 +318,8 @@ private:
};
LLSDXMLParser::Impl::Impl()
LLSDXMLParser::Impl::Impl(bool emit_errors)
: mEmitErrors(emit_errors)
{
mParser = XML_ParserCreate(NULL);
reset();
@ -404,7 +406,10 @@ S32 LLSDXMLParser::Impl::parse(std::istream& input, LLSD& data)
{
((char*) buffer)[count ? count - 1 : 0] = '\0';
}
llinfos << "LLSDXMLParser::Impl::parse: XML_STATUS_ERROR parsing:" << (char*) buffer << llendl;
if (mEmitErrors)
{
llinfos << "LLSDXMLParser::Impl::parse: XML_STATUS_ERROR parsing:" << (char*) buffer << llendl;
}
data = LLSD();
return LLSDParser::PARSE_FAILURE;
}
@ -482,7 +487,10 @@ S32 LLSDXMLParser::Impl::parseLines(std::istream& input, LLSD& data)
if (status == XML_STATUS_ERROR
&& !mGracefullStop)
{
llinfos << "LLSDXMLParser::Impl::parseLines: XML_STATUS_ERROR" << llendl;
if (mEmitErrors)
{
llinfos << "LLSDXMLParser::Impl::parseLines: XML_STATUS_ERROR" << llendl;
}
return LLSDParser::PARSE_FAILURE;
}
@ -923,7 +931,7 @@ LLSDXMLParser::Impl::Element LLSDXMLParser::Impl::readElement(const XML_Char* na
/**
* LLSDXMLParser
*/
LLSDXMLParser::LLSDXMLParser() : impl(* new Impl)
LLSDXMLParser::LLSDXMLParser(bool emit_errors /* = true */) : impl(* new Impl(emit_errors))
{
}

2
indra/llcrashlogger/llcrashlogger.cpp
View File

@ -163,7 +163,7 @@ void LLCrashLogger::gatherFiles()
// Look for it in the debug_info.log file
if (debug_log_file.is_open())
{
{
LLSDSerialize::fromXML(mDebugLog, debug_log_file);
mCrashInPreviousExec = mDebugLog["CrashNotHandled"].asBoolean();

6
indra/llmessage/llavatarnamecache.cpp
View File

@ -460,8 +460,10 @@ void LLAvatarNameCache::cleanupClass()
void LLAvatarNameCache::importFile(std::istream& istr)
{
LLSD data;
S32 parse_count = LLSDSerialize::fromXMLDocument(data, istr);
if (parse_count < 1) return;
if (LLSDParser::PARSE_FAILURE == LLSDSerialize::fromXMLDocument(data, istr))
{
return;
}
// by convention LLSD storage is a map
// we only store one entry in the map

4
indra/llmessage/llcachename.cpp
View File

@ -312,8 +312,10 @@ boost::signals2::connection LLCacheName::addObserver(const LLCacheNameCallback&
bool LLCacheName::importFile(std::istream& istr)
{
LLSD data;
if(LLSDSerialize::fromXMLDocument(data, istr) < 1)
if(LLSDParser::PARSE_FAILURE == LLSDSerialize::fromXMLDocument(data, istr))
{
return false;
}
// We'll expire entries more than a week old
U32 now = (U32)time(NULL);

4
indra/llmessage/llcurl.cpp
View File

@ -175,9 +175,11 @@ void LLCurl::Responder::completedRaw(
{
LLSD content;
LLBufferStream istr(channels, buffer.get());
if (!LLSDSerialize::fromXML(content, istr))
const bool emit_errors = false;
if (LLSDParser::PARSE_FAILURE == LLSDSerialize::fromXML(content, istr, emit_errors))
{
llinfos << "Failed to deserialize LLSD. " << mURL << " [" << status << "]: " << reason << llendl;
content["reason"] = reason;
}
completed(status, reason, content);

3
indra/llplugin/llpluginprocessparent.cpp
View File

@ -31,6 +31,7 @@
#include "llpluginprocessparent.h"
#include "llpluginmessagepipe.h"
#include "llpluginmessageclasses.h"
#include "llsdserialize.h"
#include "stringize.h"
#include "llapr.h"
@ -855,7 +856,7 @@ void LLPluginProcessParent::receiveMessageRaw(const std::string &message)
LL_DEBUGS("Plugin") << "Received: " << message << LL_ENDL;
LLPluginMessage parsed;
if(parsed.parse(message) != -1)
if(LLSDParser::PARSE_FAILURE != parsed.parse(message))
{
if(parsed.hasValue("blocking_request"))
{

42
indra/llprimitive/llmodel.cpp
View File

@ -191,6 +191,13 @@ LLModel::EModelStatus load_face_from_dom_triangles(std::vector<LLVolumeFace>& fa
LLVolumeFace::VertexData cv;
if (pos_source)
{
// <FS:ND> FIRE-9394; Guard against all kind of out of bounds access
if( i+pos_offset >= idx.getCount() )
return LLModel::BAD_ELEMENT;
if( (idx[i+pos_offset]*3+2) >= v.getCount() )
return LLModel::BAD_ELEMENT;
// </FS:ND>
cv.setPosition(LLVector4a(v[idx[i+pos_offset]*3+0],
v[idx[i+pos_offset]*3+1],
v[idx[i+pos_offset]*3+2]));
@ -198,12 +205,26 @@ LLModel::EModelStatus load_face_from_dom_triangles(std::vector<LLVolumeFace>& fa
if (tc_source)
{
// <FS:ND> FIRE-9394; Guard against all kind of out of bounds access
if( i+tc_offset >= idx.getCount() )
return LLModel::BAD_ELEMENT;
if( (idx[i+tc_offset]*2+1) >= tc.getCount() )
return LLModel::BAD_ELEMENT;
// </FS:ND>
cv.mTexCoord.setVec(tc[idx[i+tc_offset]*2+0],
tc[idx[i+tc_offset]*2+1]);
}
if (norm_source)
{
// <FS:ND> FIRE-9394; Guard against all kind of out of bounds access
if( i+norm_offset >= idx.getCount() )
return LLModel::BAD_ELEMENT;
if( (idx[i+norm_offset]*3+2) >= n.getCount() )
return LLModel::BAD_ELEMENT;
// </FS:ND>
cv.setNormal(LLVector4a(n[idx[i+norm_offset]*3+0],
n[idx[i+norm_offset]*3+1],
n[idx[i+norm_offset]*3+2]));
@ -394,6 +415,13 @@ LLModel::EModelStatus load_face_from_dom_polylist(std::vector<LLVolumeFace>& fac
}
// </FS:ND>
// <FS:ND> FIRE-9394; Guard against all kind of out of bounds access
if( cur_idx+pos_offset >= idx.getCount() )
return LLModel::BAD_ELEMENT;
if( (idx[cur_idx+pos_offset]*3+2) >= v.getCount() )
return LLModel::BAD_ELEMENT;
// </FS:ND>
cv.getPosition().set(v[idx[cur_idx+pos_offset]*3+0],
v[idx[cur_idx+pos_offset]*3+1],
v[idx[cur_idx+pos_offset]*3+2]);
@ -401,12 +429,26 @@ LLModel::EModelStatus load_face_from_dom_polylist(std::vector<LLVolumeFace>& fac
if (tc_source)
{
// <FS:ND> FIRE-9394; Guard against all kind of out of bounds access
if( cur_idx+tc_offset >= idx.getCount() )
return LLModel::BAD_ELEMENT;
if( (idx[cur_idx+tc_offset]*2+1) >= tc.getCount() )
return LLModel::BAD_ELEMENT;
// </FS:ND>
cv.mTexCoord.setVec(tc[idx[cur_idx+tc_offset]*2+0],
tc[idx[cur_idx+tc_offset]*2+1]);
}
if (norm_source)
{
// <FS:ND> FIRE-9394; Guard against all kind of out of bounds access
if( cur_idx+norm_offset >= idx.getCount() )
return LLModel::BAD_ELEMENT;
if( (idx[cur_idx+norm_offset]*3+2) >= n.getCount() )
return LLModel::BAD_ELEMENT;
// </FS:ND>
cv.getNormal().set(n[idx[cur_idx+norm_offset]*3+0],
n[idx[cur_idx+norm_offset]*3+1],
n[idx[cur_idx+norm_offset]*3+2]);

8
indra/llui/llspellcheck.cpp
View File

@ -145,10 +145,14 @@ void LLSpellChecker::refreshDictionaryMap()
// Load dictionary information (file name, friendly name, ...)
llifstream user_file(user_path + DICT_FILE_MAIN, std::ios::binary);
if ( (!user_file.is_open()) || (0 == LLSDSerialize::fromXMLDocument(sDictMap, user_file)) || (0 == sDictMap.size()) )
if ( (!user_file.is_open())
|| (LLSDParser::PARSE_FAILURE == LLSDSerialize::fromXMLDocument(sDictMap, user_file))
|| (0 == sDictMap.size()) )
{
llifstream app_file(app_path + DICT_FILE_MAIN, std::ios::binary);
if ( (!app_file.is_open()) || (0 == LLSDSerialize::fromXMLDocument(sDictMap, app_file)) || (0 == sDictMap.size()) )
if ( (!app_file.is_open())
|| (LLSDParser::PARSE_FAILURE == LLSDSerialize::fromXMLDocument(sDictMap, app_file))
|| (0 == sDictMap.size()) )
{
return;
}

6
indra/llxml/llcontrol.cpp
View File

@ -940,12 +940,10 @@ U32 LLControlGroup::loadFromFile(const std::string& filename, bool set_default_v
return 0;
}
S32 ret = LLSDSerialize::fromXML(settings, infile);
if (ret <= 0)
if (LLSDParser::PARSE_FAILURE == LLSDSerialize::fromXML(settings, infile))
{
infile.close();
llwarns << "Unable to open LLSD control file " << filename << ". Trying Legacy Method." << llendl;
llwarns << "Unable to parse LLSD control file " << filename << ". Trying Legacy Method." << llendl;
return loadFromFileLegacy(filename, TRUE, TYPE_STRING);
}

1
indra/newview/aoengine.cpp
View File

@ -19,6 +19,7 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
* $/LicenseInfo$
*/
#include "llviewerprecompiledheaders.h"

1
indra/newview/aoengine.h
View File

@ -19,6 +19,7 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
* $/LicenseInfo$
*/
#ifndef AOENGINE_H

1
indra/newview/aoset.cpp
View File

@ -19,6 +19,7 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
* $/LicenseInfo$
*/
#include "llviewerprecompiledheaders.h"

1
indra/newview/aoset.h
View File

@ -19,6 +19,7 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
* $/LicenseInfo$
*/
#ifndef AOSET_H

33
indra/newview/app_settings/grids.fallback.xml
View File

@ -178,39 +178,10 @@
</map>
<key>login.aurorascape.com:8002</key>
<map>
<key>LastModified</key>
<date>2013-02-17T18:13:40.60Z</date>
<key>about</key>
<string>http://aurorascape.com/</string>
<key>gridname</key>
<string>AuroraScape</string>
<key>gridnick</key>
<string>AuroraScape</string>
<key>help</key>
<string>http://forum.aurorascape.com/</string>
<key>helperuri</key>
<string>http://login.aurorascape.com:8002/</string>
<key>login_identifier_types</key>
<array>
<string>agent</string>
<string>account</string>
</array>
<key>loginpage</key>
<string>http://login.aurorascape.com:8008/welcomescreen/index.html</string>
<key>loginuri</key>
<array>
<string>http://login.aurorascape.com:8002/</string>
</array>
<key>DEPRECATED</key>
<string>TRUE</string>
<key>name</key>
<string>login.aurorascape.com:8002</string>
<key>password</key>
<string>http://login.aurorascape.com:8008/forgot_pass.html</string>
<key>platform</key>
<string>Aurora</string>
<key>register</key>
<string>http://login.aurorascape.com:8008/register.html</string>
<key>slurl_base</key>
<string>hop://login.aurorascape.com:8002/</string>
</map>
<key>login.avination.com/</key>
<map>

7
indra/newview/app_settings/logcontrol.xml
View File

@ -42,9 +42,10 @@
</array>
<key>tags</key>
<array>
<string>Avatar</string>
<!-- sample entry for debugging specific items
<string>Voice</string>
<!-- sample entry for debugging specific items
<string>Voice</string>
<string>Avatar</string>
-->
<string>parseFile</string>
</array>

8
indra/newview/app_settings/posestand.xml
View File

@ -18,22 +18,22 @@
<key>a0f213b6-5506-3cf8-32ac-cfc9684048e7</key>
<map>
<key>name</key>
<string>PS_Arms_downward_Legs_together</string>
<string>PS_Arms_downward_Legs_apart</string>
</map>
<key>9e95943d-8020-e622-a4e0-4c9f8058091a</key>
<map>
<key>name</key>
<string>PS_Arms_downward_Legs_apart</string>
<string>PS_Arms_downward_Legs_together</string>
</map>
<key>6c5e15de-7079-f558-d635-7123b7379dec</key>
<map>
<key>name</key>
<string>PS_Arms_foreward_Legs_apart</string>
<string>PS_Arms_forward_Legs_apart</string>
</map>
<key>58401663-f5d3-828c-6cb5-ff618308e6be</key>
<map>
<key>name</key>
<string>PS_Arms_foreward_Legs_together</string>
<string>PS_Arms_forward_Legs_together</string>
</map>
<key>7598be4b-6b1d-afaf-bc5e-0708fa3c214a</key>
<map>

35
indra/newview/app_settings/settings.xml
View File

@ -1676,17 +1676,6 @@
<key>Value</key>
<integer>0</integer>
</map>
<key>AgentAppearanceServiceURL</key>
<map>
<key>Comment</key>
<string>Current Session Agent Appearance Service URL</string>
<key>Persist</key>
<integer>0</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string></string>
</map>
<key>AlertedUnsupportedHardware</key>
<map>
<key>Comment</key>
@ -3702,6 +3691,28 @@
<key>Value</key>
<integer>0</integer>
</map>
<key>DebugAvatarExperimentalServerAppearanceUpdate</key>
<map>
<key>Comment</key>
<string>Experiment with sending full cof_contents instead of cof_version</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>DebugAvatarAppearanceServiceURLOverride</key>
<map>
<key>Comment</key>
<string>URL to use for baked texture requests; overrides value returned by login server.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string />
</map>
<key>DebugAvatarRezTime</key>
<map>
<key>Comment</key>
@ -9619,7 +9630,7 @@ Change of this parameter will affect the layout of buttons in notification toast
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
<integer>0</integer>
<key>Backup</key>
<integer>0</integer>
</map>

5
indra/newview/fsareasearch.h
View File

@ -25,6 +25,9 @@
* $/LicenseInfo$
*/
#ifndef FS_AREASEARCH_H
#define FS_AREASEARCH_H
#include "llfloater.h"
#include "llsingleton.h"
#include "lluuid.h"
@ -389,3 +392,5 @@ public:
private:
FSAreaSearch* mFSAreaSearch;
};
#endif // FS_AREASEARCH_H

4
indra/newview/fscommon.cpp
View File

@ -19,6 +19,10 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* The Phoenix Firestorm Project, Inc., 1831 Oakwood Drive, Fairmont, Minnesota 56031-3225 USA
* http://www.firestormviewer.org
* $/LicenseInfo$
*/
#include "llviewerprecompiledheaders.h"

4
indra/newview/fscommon.h
View File

@ -19,6 +19,10 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* The Phoenix Firestorm Project, Inc., 1831 Oakwood Drive, Fairmont, Minnesota 56031-3225 USA
* http://www.firestormviewer.org
* $/LicenseInfo$
*/
#ifndef FS_COMMON_H

4
indra/newview/fsconsoleutils.cpp
View File

@ -19,6 +19,10 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* The Phoenix Firestorm Project, Inc., 1831 Oakwood Drive, Fairmont, Minnesota 56031-3225 USA
* http://www.firestormviewer.org
* $/LicenseInfo$
*/
#include "llviewerprecompiledheaders.h"

4
indra/newview/fsconsoleutils.h
View File

@ -19,6 +19,10 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* The Phoenix Firestorm Project, Inc., 1831 Oakwood Drive, Fairmont, Minnesota 56031-3225 USA
* http://www.firestormviewer.org
* $/LicenseInfo$
*/
#ifndef FS_CONSOLEUTILS_H

1
indra/newview/fscontactsfloater.cpp
View File

@ -21,6 +21,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* The Phoenix Firestorm Project, Inc., 1831 Oakwood Drive, Fairmont, Minnesota 56031-3225 USA
* http://www.firestormviewer.org
* $/LicenseInfo$
*/

1
indra/newview/fscontactsfloater.h
View File

@ -21,6 +21,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* The Phoenix Firestorm Project, Inc., 1831 Oakwood Drive, Fairmont, Minnesota 56031-3225 USA
* http://www.firestormviewer.org
* $/LicenseInfo$
*/

5
indra/newview/fsdata.h
View File

@ -29,6 +29,9 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef FS_DATA_H
#define FS_DATA_H
#include <map>
#include <llsd.h>
#include <llinstantmessage.h>
@ -100,3 +103,5 @@ private:
FSDataAgent mSupportAgent;
std::map<LLUUID, FSDataAgent> mSupportAgentList;
};
#endif // FS_DATA_H

4
indra/newview/fsfloaterblocklist.cpp
View File

@ -19,6 +19,10 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* The Phoenix Firestorm Project, Inc., 1831 Oakwood Drive, Fairmont, Minnesota 56031-3225 USA
* http://www.firestormviewer.org
* $/LicenseInfo$
*/
#include "llviewerprecompiledheaders.h"

4
indra/newview/fsfloaterblocklist.h
View File

@ -19,6 +19,10 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* The Phoenix Firestorm Project, Inc., 1831 Oakwood Drive, Fairmont, Minnesota 56031-3225 USA
* http://www.firestormviewer.org
* $/LicenseInfo$
*/
#ifndef FS_FLOATERBLOCKLIST_H

4
indra/newview/fsfloatergroup.cpp
View File

@ -19,6 +19,10 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* The Phoenix Firestorm Project, Inc., 1831 Oakwood Drive, Fairmont, Minnesota 56031-3225 USA
* http://www.firestormviewer.org
* $/LicenseInfo$
*/
#include "llviewerprecompiledheaders.h"

4
indra/newview/fsfloatergroup.h
View File

@ -19,6 +19,10 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* The Phoenix Firestorm Project, Inc., 1831 Oakwood Drive, Fairmont, Minnesota 56031-3225 USA
* http://www.firestormviewer.org
* $/LicenseInfo$
*/
#ifndef FS_FLOATERGROUP_H

4
indra/newview/fsfloaterplacedetails.cpp
View File

@ -19,6 +19,10 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* The Phoenix Firestorm Project, Inc., 1831 Oakwood Drive, Fairmont, Minnesota 56031-3225 USA
* http://www.firestormviewer.org
* $/LicenseInfo$
*/
#include "llviewerprecompiledheaders.h"

4
indra/newview/fsfloaterplacedetails.h
View File

@ -19,6 +19,10 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* The Phoenix Firestorm Project, Inc., 1831 Oakwood Drive, Fairmont, Minnesota 56031-3225 USA
* http://www.firestormviewer.org
* $/LicenseInfo$
*/
#ifndef FS_FLOATERPLACEDETAILS_H

1
indra/newview/fsfloaterposestand.cpp
View File

@ -65,6 +65,7 @@ void FSFloaterPoseStand::loadPoses()
}
pose_file.close();
}
mComboPose->sortByName();
}
void FSFloaterPoseStand::onCommitCombo()

4
indra/newview/fsfloaterposestand.h
View File

@ -10,8 +10,8 @@
* ----------------------------------------------------------------------------
*/
#ifndef FS_FSFLOATERPOSESTAND_H
#define FS_FSFLOATERPOSESTAND_H
#ifndef FS_FLOATERPOSESTAND_H
#define FS_FLOATERPOSESTAND_H
#include "llfloater.h"
#include "llcombobox.h"

4
indra/newview/fsfloaterteleporthistory.cpp
View File

@ -19,6 +19,10 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* The Phoenix Firestorm Project, Inc., 1831 Oakwood Drive, Fairmont, Minnesota 56031-3225 USA
* http://www.firestormviewer.org
* $/LicenseInfo$
*/
#include "llviewerprecompiledheaders.h"

4
indra/newview/fsfloaterteleporthistory.h
View File

@ -19,6 +19,10 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* The Phoenix Firestorm Project, Inc., 1831 Oakwood Drive, Fairmont, Minnesota 56031-3225 USA
* http://www.firestormviewer.org
* $/LicenseInfo$
*/
#ifndef FS_FLOATERTELEPORTHISTORY_H

4
indra/newview/fsgrouptitles.cpp
View File

@ -18,6 +18,10 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* The Phoenix Firestorm Project, Inc., 1831 Oakwood Drive, Fairmont, Minnesota 56031-3225 USA
* http://www.firestormviewer.org
* $/LicenseInfo$
*/
#include "llviewerprecompiledheaders.h"

4
indra/newview/fsgrouptitles.h
View File

@ -18,6 +18,10 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* The Phoenix Firestorm Project, Inc., 1831 Oakwood Drive, Fairmont, Minnesota 56031-3225 USA
* http://www.firestormviewer.org
* $/LicenseInfo$
*/
#ifndef FS_GROUPTITLES_H

4
indra/newview/fskeywords.h
View File

@ -1,3 +1,5 @@
#ifndef FS_KEYWORDS_H
#define FS_KEYWORDS_H
#include "llsingleton.h"
#include "llstring.h"
@ -20,3 +22,5 @@ private:
};
#endif // FS_KEYWORDS_H

1
indra/newview/fslslbridge.cpp
View File

@ -21,6 +21,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* The Phoenix Firestorm Project, Inc., 1831 Oakwood Drive, Fairmont, Minnesota 56031-3225 USA
* http://www.firestormviewer.org
* $/LicenseInfo$
*/

2
indra/newview/fslslbridge.h
View File

@ -21,8 +21,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* The Phoenix Firestorm Project, Inc., 1831 Oakwood Drive, Fairmont, Minnesota 56031-3225 USA
* http://www.firestormviewer.org
* $/LicenseInfo$
*/
#ifndef FS_LSLBRIDGE_H
#define FS_LSLBRIDGE_H

1
indra/newview/fslslbridgerequest.cpp
View File

@ -21,6 +21,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* The Phoenix Firestorm Project, Inc., 1831 Oakwood Drive, Fairmont, Minnesota 56031-3225 USA
* http://www.firestormviewer.org
* $/LicenseInfo$
*/

1
indra/newview/fslslbridgerequest.h
View File

@ -21,6 +21,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* The Phoenix Firestorm Project, Inc., 1831 Oakwood Drive, Fairmont, Minnesota 56031-3225 USA
* http://www.firestormviewer.org
* $/LicenseInfo$
*/

5
indra/newview/fslslpreproc.h
View File

@ -29,6 +29,9 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef FS_LSLPREPROC_H
#define FS_LSLPREPROC_H
#include "llviewerprecompiledheaders.h"
#include "llpreviewscript.h"
@ -83,3 +86,5 @@ public:
BOOL mHDDInclude;
std::string mMainScriptName;
};
#endif // FS_LSLPREPROC_H

1
indra/newview/fsmoneytracker.cpp
View File

@ -18,6 +18,7 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
* $/LicenseInfo$
*/
#include "llviewerprecompiledheaders.h"

1
indra/newview/fsmoneytracker.h
View File

@ -18,6 +18,7 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
* $/LicenseInfo$
*/
#ifndef FS_MONEYTRACKER_H

4
indra/newview/fsnearbychatvoicemonitor.cpp
View File

@ -18,6 +18,10 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* The Phoenix Firestorm Project, Inc., 1831 Oakwood Drive, Fairmont, Minnesota 56031-3225 USA
* http://www.firestormviewer.org
* $/LicenseInfo$
*/
#include "llviewerprecompiledheaders.h"

4
indra/newview/fsnearbychatvoicemonitor.h
View File

@ -18,6 +18,10 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* The Phoenix Firestorm Project, Inc., 1831 Oakwood Drive, Fairmont, Minnesota 56031-3225 USA
* http://www.firestormviewer.org
* $/LicenseInfo$
*/
#ifndef FS_NEARBYCHATVOICEMONITOR_H

11
indra/newview/fspanelprefs.h
View File

@ -1,9 +1,13 @@
/*${License blank}*/
#ifndef panel_prefs_firestorm
#define panel_prefs_firestorm
#ifndef FS_PANELPREFS_H
#define FS_PANELPREFS_H
#include "llfloaterpreference.h"
#include "lllineeditor.h"
class LLLineEditor;
class PanelPreferenceFirestorm : public LLPanelPreference
{
public:
@ -30,4 +34,5 @@ protected:
LLComboBox* m_ColorClienttags;
LLComboBox* m_ClientTagsVisibility;
};
#endif
#endif // FS_PANELPREFS_H

10
indra/newview/fspose.h
View File

@ -10,10 +10,8 @@
* ----------------------------------------------------------------------------
*/
#ifndef FS_FSPOSE_H
#define FS_FSPOSE_H
#endif // FS_FSPOSE_H
#ifndef FS_POSE_H
#define FS_POSE_H
#include "llsingleton.h"
@ -29,4 +27,6 @@ protected:
~FSPose();
private:
LLUUID mCurrentPose;
};
};
#endif // FS_POSE_H

4
indra/newview/fsslurlcommand.cpp
View File

@ -18,6 +18,10 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* The Phoenix Firestorm Project, Inc., 1831 Oakwood Drive, Fairmont, Minnesota 56031-3225 USA
* http://www.firestormviewer.org
* $/LicenseInfo$
*/
#include "llviewerprecompiledheaders.h"

4
indra/newview/fsslurlcommand.h
View File

@ -18,6 +18,10 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* The Phoenix Firestorm Project, Inc., 1831 Oakwood Drive, Fairmont, Minnesota 56031-3225 USA
* http://www.firestormviewer.org
* $/LicenseInfo$
*/
#ifndef FS_SLURLCOMMAND_H

5
indra/newview/fswsassetblacklist.h
View File

@ -25,6 +25,9 @@
* $/LicenseInfo$
*/
#ifndef FS_WSASSETBLACKLIST_H
#define FS_WSASSETBLACKLIST_H
#include "llviewerprecompiledheaders.h"
#include "llsingleton.h"
#include "llfloater.h"
@ -51,3 +54,5 @@ private:
static std::string blacklist_file_name;
static BlacklistMAP BlacklistIDs;
};
#endif // FS_WSASSETBLACKLIST_H

3
indra/newview/kcwlinterface.cpp
View File

@ -18,8 +18,9 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* The Phoenix Firestorm Project, 1831 Oakwood Drive, Fairmont, Minnesota 56031-3225 USA
* The Phoenix Firestorm Project, Inc., 1831 Oakwood Drive, Fairmont, Minnesota 56031-3225 USA
* http://www.firestormviewer.org
* $/LicenseInfo$
*/
#include "llviewerprecompiledheaders.h"

8
indra/newview/kcwlinterface.h
View File

@ -18,10 +18,14 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* The Phoenix Firestorm Project, 1831 Oakwood Drive, Fairmont, Minnesota 56031-3225 USA
* The Phoenix Firestorm Project, Inc., 1831 Oakwood Drive, Fairmont, Minnesota 56031-3225 USA
* http://www.firestormviewer.org
* $/LicenseInfo$
*/
#ifndef KC_WLINTERFACE_H
#define KC_WLINTERFACE_H
#include "llviewerprecompiledheaders.h"
#include "llsingleton.h"
#include "lleventtimer.h"
@ -79,3 +83,5 @@ protected:
bool mHaveRegionSettings;
bool mDisabled; // control bool to clear all states after being disabled
};
#endif // KC_WLINTERFACE_H

4
indra/newview/lggbeamcolormapfloater.h
View File

@ -11,6 +11,8 @@
* http://sam.zoy.org/wtfpl/COPYING for more details.
*/
#ifndef LGG_BEAMCOLORMAPFLOATER_H
#define LGG_BEAMCOLORMAPFLOATER_H
#include "llviewerprecompiledheaders.h"
@ -70,3 +72,5 @@ protected:
LLSliderCtrl* mColorSlider;
};
#endif // LGG_BEAMCOLORMAPFLOATER_H

5
indra/newview/lggbeammapfloater.h
View File

@ -11,6 +11,9 @@
* http://sam.zoy.org/wtfpl/COPYING for more details.
*/
#ifndef LGG_BEAMMAPFLOATER_H
#define LGG_BEAMMAPFLOATER_H
#include "llviewerprecompiledheaders.h"
#include "llagentdata.h"
@ -75,3 +78,5 @@ private:
F32 mContextConeOpacity;
};
#endif // LGG_BEAMMAPFLOATER_H

5
indra/newview/lggbeammaps.h
View File

@ -11,6 +11,9 @@
* http://sam.zoy.org/wtfpl/COPYING for more details.
*/
#ifndef LGG_BEAMMAPS_H
#define LGG_BEAMMAPS_H
#include "llhudeffecttrail.h"
#include "llviewerprecompiledheaders.h"
#include "lggbeamscolors.h"
@ -51,3 +54,5 @@ class lggBeamMaps
extern lggBeamMaps gLggBeamMaps;
#endif // LGG_BEAMMAPS_H

6
indra/newview/lggbeamscolors.h
View File

@ -11,8 +11,8 @@
* http://sam.zoy.org/wtfpl/COPYING for more details.
*/
#ifndef LGGBEAMCOLORDATA
#define LGGBEAMCOLORDATA
#ifndef LGG_BEAMSCOLORS_H
#define LGG_BEAMSCOLORS_H
#include "llviewerprecompiledheaders.h"
@ -41,4 +41,4 @@ public:
// List sorted by name.
};
#endif
#endif // LGG_BEAMSCOLORS_H

6
indra/newview/lggcontactsets.h
View File

@ -16,8 +16,8 @@
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
02111-1307, USA. */
#ifndef LGG_FRIENDS_GROUPS_H
#define LGG_FRIENDS_GROUPS_H
#ifndef LGG_CONTACTSETS_H
#define LGG_CONTACTSETS_H
#include "v4color.h"
@ -88,4 +88,4 @@ private:
};
#endif
#endif // LGG_CONTACTSETS_H

6
indra/newview/lggcontactsetsfloater.h
View File

@ -16,8 +16,8 @@
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
02111-1307, USA. */
#ifndef LGG_FRIENDS_GROUPS_FLOATER_H
#define LGG_FRIENDS_GROUPS_FLOATER_H
#ifndef LGG_CONTACTSETSFLOATER_H
#define LGG_CONTACTSETSFLOATER_H
#include "llview.h"
#include "llviewerinventory.h"
@ -119,4 +119,4 @@ public:
};
#endif
#endif // LGG_CONTACTSETSFLOATER_H

4
indra/newview/llaccountingcostmanager.cpp
View File

@ -56,9 +56,9 @@ public:
}
}
void error( U32 statusNum, const std::string& reason )
void errorWithContent( U32 statusNum, const std::string& reason, const LLSD& content )
{
llwarns << "Transport error "<<reason<<llendl;
llwarns << "Transport error [status:" << statusNum << "]: " << content <<llendl;
clearPendingRequests();
LLAccountingCostObserver* observer = mObserverHandle.get();

16
indra/newview/llagent.cpp
View File

@ -2890,7 +2890,7 @@ public:
virtual ~LLMaturityPreferencesResponder();
virtual void result(const LLSD &pContent);
virtual void error(U32 pStatus, const std::string& pReason);
virtual void errorWithContent(U32 pStatus, const std::string& pReason, const LLSD& pContent);
protected:
@ -2928,11 +2928,11 @@ void LLMaturityPreferencesResponder::result(const LLSD &pContent)
mAgent->handlePreferredMaturityResult(actualMaturity);
}
void LLMaturityPreferencesResponder::error(U32 pStatus, const std::string& pReason)
void LLMaturityPreferencesResponder::errorWithContent(U32 pStatus, const std::string& pReason, const LLSD& pContent)
{
llwarns << "while attempting to change maturity preference from '" << LLViewerRegion::accessToString(mPreviousMaturity)
<< "' to '" << LLViewerRegion::accessToString(mPreferredMaturity) << "', we got an error because '"
<< pReason << "' [status:" << pStatus << "]" << llendl;
<< "' to '" << LLViewerRegion::accessToString(mPreferredMaturity) << "', we got an error with [status:"
<< pStatus << "]: " << (pContent.isDefined() ? pContent : LLSD(pReason)) << llendl;
mAgent->handlePreferredMaturityError();
}
@ -3122,7 +3122,7 @@ void LLAgent::sendMaturityPreferenceToServer(U8 pPreferredMaturity)
// If we don't have a region, report it as an error
if (getRegion() == NULL)
{
responderPtr->error(0U, "region is not defined");
responderPtr->errorWithContent(0U, "region is not defined", LLSD());
}
else
{
@ -3132,7 +3132,8 @@ void LLAgent::sendMaturityPreferenceToServer(U8 pPreferredMaturity)
// If the capability is not defined, report it as an error
if (url.empty())
{
responderPtr->error(0U, "capability 'UpdateAgentInformation' is not defined for region");
responderPtr->errorWithContent(0U,
"capability 'UpdateAgentInformation' is not defined for region", LLSD());
}
else
{
@ -4893,9 +4894,6 @@ void LLAgent::sendAgentSetAppearance()
}
if (!isAgentAvatarValid() || (getRegion() && getRegion()->getCentralBakeVersion())) return;
LL_INFOS("Avatar") << gAgentAvatarp->avString() << "TAT: Sent AgentSetAppearance: " << gAgentAvatarp->getBakedStatusForPrintout() << LL_ENDL;
//dumpAvatarTEs( "sendAgentSetAppearance()" );

2
indra/newview/llagentpilot.cpp
View File

@ -139,7 +139,7 @@ void LLAgentPilot::loadXML(const std::string& filename)
mActions.reset();
LLSD record;
while (!file.eof() && LLSDSerialize::fromXML(record, file))
while (!file.eof() && LLSDParser::PARSE_FAILURE != LLSDSerialize::fromXML(record, file))
{
Action action;
action.mTime = record["time"].asReal();

88
indra/newview/llappearancemgr.cpp
View File

@ -26,6 +26,7 @@
#include "llviewerprecompiledheaders.h"
#include <boost/lexical_cast.hpp>
#include "llaccordionctrltab.h"
#include "llagent.h"
#include "llagentcamera.h"
@ -60,6 +61,11 @@
#include "fslslbridge.h"
//-TT
#if LL_MSVC
// disable boost::lexical_cast warning
#pragma warning (disable:4702)
#endif
std::string self_av_string()
{
// On logout gAgentAvatarp can already be invalid
@ -3635,7 +3641,8 @@ public:
LLSD LLAppearanceMgr::dumpCOF() const
{
LLSD result = LLSD::emptyArray();
LLSD links = LLSD::emptyArray();
LLMD5 md5;
LLInventoryModel::cat_array_t cat_array;
LLInventoryModel::item_array_t item_array;
@ -3644,13 +3651,54 @@ LLSD LLAppearanceMgr::dumpCOF() const
{
const LLViewerInventoryItem* inv_item = item_array.get(i).get();
LLSD item;
item["item_id"] = inv_item->getUUID();
item["linked_item_id"] = inv_item->getLinkedUUID();
item["name"] = inv_item->getName();
LLUUID item_id(inv_item->getUUID());
md5.update((unsigned char*)item_id.mData, 16);
item["description"] = inv_item->getActualDescription();
item["type"] = inv_item->getActualType();
result.append(item);
md5.update(inv_item->getActualDescription());
item["asset_type"] = inv_item->getActualType();
LLUUID linked_id(inv_item->getLinkedUUID());
item["linked_id"] = linked_id;
md5.update((unsigned char*)linked_id.mData, 16);
if (LLAssetType::AT_LINK == inv_item->getActualType())
{
const LLViewerInventoryItem* linked_item = inv_item->getLinkedItem();
if (NULL == linked_item)
{
llwarns << "Broken link for item '" << inv_item->getName()
<< "' (" << inv_item->getUUID()
<< ") during requestServerAppearanceUpdate" << llendl;
continue;
}
// Some assets may be 'hidden' and show up as null in the viewer.
//if (linked_item->getAssetUUID().isNull())
//{
// llwarns << "Broken link (null asset) for item '" << inv_item->getName()
// << "' (" << inv_item->getUUID()
// << ") during requestServerAppearanceUpdate" << llendl;
// continue;
//}
LLUUID linked_asset_id(linked_item->getAssetUUID());
md5.update((unsigned char*)linked_asset_id.mData, 16);
U32 flags = linked_item->getFlags();
md5.update(boost::lexical_cast<std::string>(flags));
}
else if (LLAssetType::AT_LINK_FOLDER != inv_item->getActualType())
{
llwarns << "Non-link item '" << inv_item->getName()
<< "' (" << inv_item->getUUID()
<< ") type " << (S32) inv_item->getActualType()
<< " during requestServerAppearanceUpdate" << llendl;
continue;
}
links.append(item);
}
LLSD result = LLSD::emptyMap();
result["cof_contents"] = links;
char cof_md5sum[MD5HEX_STR_SIZE];
md5.finalize();
md5.hex_digest(cof_md5sum);
result["cof_md5sum"] = std::string(cof_md5sum);
return result;
}
@ -3680,14 +3728,17 @@ void LLAppearanceMgr::requestServerAppearanceUpdate(LLCurl::ResponderPtr respond
LLSD body;
S32 cof_version = getCOFVersion();
body["cof_version"] = cof_version;
if (gSavedSettings.getBOOL("DebugForceAppearanceRequestFailure"))
if (gSavedSettings.getBOOL("DebugAvatarExperimentalServerAppearanceUpdate"))
{
body["cof_version"] = cof_version+999;
body = dumpCOF();
}
if (gSavedSettings.getBOOL("DebugAvatarAppearanceMessage"))
else
{
body["debug_cof"] = dumpCOF();
body["cof_version"] = cof_version;
if (gSavedSettings.getBOOL("DebugForceAppearanceRequestFailure"))
{
body["cof_version"] = cof_version+999;
}
}
LL_DEBUGS("Avatar") << "request url " << url << " my_cof_version " << cof_version << llendl;
@ -3725,10 +3776,10 @@ public:
app_mgr->mLastUpdateRequestCOFVersion = new_version;
}
virtual void error(U32 pStatus, const std::string& pReason)
virtual void errorWithContent(U32 pStatus, const std::string& pReason, const LLSD& content)
{
llwarns << "While attempting to increment the agent's cof we got an error because '"
<< pReason << "' [status:" << pStatus << "]" << llendl;
llwarns << "While attempting to increment the agent's cof we got an error with [status:"
<< pStatus << "]: " << content << llendl;
F32 seconds_to_wait;
if (mRetryPolicy->shouldRetry(pStatus,seconds_to_wait))
{
@ -3776,6 +3827,15 @@ void LLAppearanceMgr::incrementCofVersion(LLHTTPClient::ResponderPtr responder_p
LLHTTPClient::get(url, body, responder_ptr, headers, 30.0f);
}
std::string LLAppearanceMgr::getAppearanceServiceURL() const
{
if (gSavedSettings.getString("DebugAvatarAppearanceServiceURLOverride").empty())
{
return mAppearanceServiceURL;
}
return gSavedSettings.getString("DebugAvatarAppearanceServiceURLOverride");
}
void show_created_outfit(LLUUID& folder_id, bool show_panel = true)
{
if (!LLApp::isRunning())

7
indra/newview/llappearancemgr.h
View File

@ -222,6 +222,13 @@ public:
// *HACK Remove this after server side texture baking is deployed on all sims.
void incrementCofVersionLegacy();
void setAppearanceServiceURL(const std::string& url) { mAppearanceServiceURL = url; }
std::string getAppearanceServiceURL() const;
private:
std::string mAppearanceServiceURL;
protected:
LLAppearanceMgr();
~LLAppearanceMgr();

5
indra/newview/llappviewerwin32.cpp
View File

@ -127,7 +127,10 @@ void ll_nvapi_init(NvDRSSessionHandle hSession)
}
NvAPI_UnicodeString profile_name;
std::string app_name = LLTrans::getString("APP_NAME");
// <FS:Ansariel> Use "Second Life" as app name to load the correct profile
//std::string app_name = LLTrans::getString("APP_NAME");
std::string app_name = "Second Life";
// </FS:Ansariel>
llutf16string w_app_name = utf8str_to_utf16str(app_name);
wsprintf(profile_name, L"%s", w_app_name.c_str());
status = NvAPI_DRS_SetCurrentGlobalProfile(hSession, profile_name);

7
indra/newview/llassetuploadqueue.cpp
View File

@ -71,10 +71,11 @@ public:
delete mData;
}
virtual void error(U32 statusNum, const std::string& reason)
virtual void errorWithContent(U32 statusNum, const std::string& reason, const LLSD& content)
{
llwarns << "Error: " << reason << llendl;
LLUpdateTaskInventoryResponder::error(statusNum, reason);
llwarns << "LLAssetUploadChainResponder Error [status:"
<< statusNum << "]: " << content << llendl;
LLUpdateTaskInventoryResponder::errorWithContent(statusNum, reason, content);
LLAssetUploadQueue *queue = mSupplier->get();
if (queue)
{

15
indra/newview/llassetuploadresponders.cpp
View File

@ -229,10 +229,10 @@ LLAssetUploadResponder::~LLAssetUploadResponder()
}
// virtual
void LLAssetUploadResponder::error(U32 statusNum, const std::string& reason)
void LLAssetUploadResponder::errorWithContent(U32 statusNum, const std::string& reason, const LLSD& content)
{
llinfos << "LLAssetUploadResponder::error " << statusNum
<< " reason: " << reason << llendl;
llinfos << "LLAssetUploadResponder::error [status:"
<< statusNum << "]: " << content << llendl;
LLSD args;
switch(statusNum)
{
@ -344,9 +344,9 @@ LLNewAgentInventoryResponder::LLNewAgentInventoryResponder(
}
// virtual
void LLNewAgentInventoryResponder::error(U32 statusNum, const std::string& reason)
void LLNewAgentInventoryResponder::errorWithContent(U32 statusNum, const std::string& reason, const LLSD& content)
{
LLAssetUploadResponder::error(statusNum, reason);
LLAssetUploadResponder::errorWithContent(statusNum, reason, content);
//LLImportColladaAssetCache::getInstance()->assetUploaded(mVFileID, LLUUID(), FALSE);
}
@ -491,9 +491,10 @@ void LLSendTexLayerResponder::uploadComplete(const LLSD& content)
}
}
void LLSendTexLayerResponder::error(U32 statusNum, const std::string& reason)
void LLSendTexLayerResponder::errorWithContent(U32 statusNum, const std::string& reason, const LLSD& content)
{
llinfos << "status: " << statusNum << " reason: " << reason << llendl;
llinfos << "LLSendTexLayerResponder error [status:"
<< statusNum << "]: " << content << llendl;
// Invoke the original callback with an error result
LLViewerTexLayerSetBuffer::onTextureUploadComplete(LLUUID(), (void*) mBakedUploadData, -1, LL_EXSTAT_NONE);

6
indra/newview/llassetuploadresponders.h
View File

@ -42,7 +42,7 @@ public:
LLAssetType::EType asset_type);
~LLAssetUploadResponder();
virtual void error(U32 statusNum, const std::string& reason);
virtual void errorWithContent(U32 statusNum, const std::string& reason, const LLSD& content);
virtual void result(const LLSD& content);
virtual void uploadUpload(const LLSD& content);
virtual void uploadComplete(const LLSD& content);
@ -67,7 +67,7 @@ public:
const LLSD& post_data,
const std::string& file_name,
LLAssetType::EType asset_type);
virtual void error(U32 statusNum, const std::string& reason);
virtual void errorWithContent(U32 statusNum, const std::string& reason, const LLSD& content);
virtual void uploadComplete(const LLSD& content);
virtual void uploadFailure(const LLSD& content);
};
@ -122,7 +122,7 @@ public:
~LLSendTexLayerResponder();
virtual void uploadComplete(const LLSD& content);
virtual void error(U32 statusNum, const std::string& reason);
virtual void errorWithContent(U32 statusNum, const std::string& reason, const LLSD& content);
LLBakedUploadData * mBakedUploadData;
};

5
indra/newview/llclassifiedstatsresponder.cpp
View File

@ -72,8 +72,7 @@ void LLClassifiedStatsResponder::result(const LLSD& content)
}
/*virtual*/
void LLClassifiedStatsResponder::error(U32 status, const std::string& reason)
void LLClassifiedStatsResponder::errorWithContent(U32 status, const std::string& reason, const LLSD& content)
{
llinfos << "LLClassifiedStatsResponder::error("
<< status << ": " << reason << ")" << llendl;
llinfos << "LLClassifiedStatsResponder::error [status:" << status << "]: " << content << llendl;
}

2
indra/newview/llclassifiedstatsresponder.h
View File

@ -39,7 +39,7 @@ public:
virtual void result(const LLSD& content);
//If we get back an error (not found, etc...), handle it here
virtual void error(U32 status, const std::string& reason);
virtual void errorWithContent(U32 status, const std::string& reason, const LLSD& content);
protected:
LLUUID mClassifiedID;

32
indra/newview/llenvmanager.cpp
View File

@ -40,6 +40,7 @@
#include "rlvhandler.h"
// [/RLVa:KB]
#include "kcwlinterface.h"
#include "quickprefs.h"
std::string LLEnvPrefs::getWaterPresetName() const
{
@ -180,6 +181,9 @@ bool LLEnvManagerNew::useRegionSettings()
bool LLEnvManagerNew::useWaterPreset(const std::string& name)
{
// <FS:Ansariel> Quickprefs integration
FloaterQuickPrefs::updateParam(QP_PARAM_WATER, LLSD(name));
LL_DEBUGS("Windlight") << "Displaying water preset " << name << LL_ENDL;
LLWaterParamManager& water_mgr = LLWaterParamManager::instance();
bool rslt = water_mgr.getParamSet(name, water_mgr.mCurParams);
@ -205,6 +209,9 @@ bool LLEnvManagerNew::useSkyPreset(const std::string& name, bool interpolate /*=
return false;
}
// <FS:Ansariel> Quickprefs integration
FloaterQuickPrefs::updateParam(QP_PARAM_SKY, LLSD(name));
LL_DEBUGS("Windlight") << "Displaying sky preset " << name << LL_ENDL;
sky_mgr.applySkyParams(param_set.getAll(), interpolate);
return true;
@ -225,6 +232,9 @@ bool LLEnvManagerNew::useDayCycle(const std::string& name, LLEnvKey::EScope scop
{
LL_DEBUGS("Windlight") << "Displaying region day cycle " << name << LL_ENDL;
params = getRegionSettings().getWLDayCycle();
// <FS:Ansariel> Quickprefs integration
FloaterQuickPrefs::updateParam(QP_PARAM_DAYCYCLE, LLSD(PRESET_NAME_REGION_DEFAULT));
}
else
{
@ -235,6 +245,9 @@ bool LLEnvManagerNew::useDayCycle(const std::string& name, LLEnvKey::EScope scop
llwarns << "No day cycle named " << name << llendl;
return false;
}
// <FS:Ansariel> Quickprefs integration
FloaterQuickPrefs::updateParam(QP_PARAM_DAYCYCLE, LLSD(name));
}
bool rslt = LLWLParamManager::instance().applyDayCycleParams(params, scope);
@ -578,6 +591,9 @@ void LLEnvManagerNew::updateWaterFromPrefs(bool interpolate)
LLWaterParamSet default_water;
water_mgr.getParamSet("Default", default_water);
target_water_params = default_water.getAll();
// <FS:Ansariel> Quickprefs integration
FloaterQuickPrefs::updateParam(QP_PARAM_WATER, LLSD("Default"));
}
if (getUseRegionSettings())
@ -588,6 +604,9 @@ void LLEnvManagerNew::updateWaterFromPrefs(bool interpolate)
{
LL_DEBUGS("Windlight") << "Applying region water" << LL_ENDL;
target_water_params = region_water_params;
// <FS:Ansariel> Quickprefs integration
FloaterQuickPrefs::updateParam(QP_PARAM_WATER, LLSD(PRESET_NAME_REGION_DEFAULT));
}
else
{
@ -606,6 +625,13 @@ void LLEnvManagerNew::updateWaterFromPrefs(bool interpolate)
// *TODO: Fix user preferences accordingly.
}
// <FS:Ansariel> Quickprefs integration
else
{
FloaterQuickPrefs::updateParam(QP_PARAM_WATER, LLSD(water));
}
// </FS:Ansariel> Quickprefs integration
target_water_params = params.getAll();
}
@ -643,6 +669,9 @@ bool LLEnvManagerNew::useRegionSky()
// *TODO: Support fixed sky from region.
// <FS:Ansariel> Quickprefs integration
FloaterQuickPrefs::updateParam(QP_PARAM_SKY, LLSD(PRESET_NAME_REGION_DEFAULT));
// Otherwise apply region day cycle.
LL_DEBUGS("Windlight") << "Applying region sky" << LL_ENDL;
return useDayCycleParams(
@ -663,6 +692,9 @@ bool LLEnvManagerNew::useRegionWater()
return useDefaultWater();
}
// <FS:Ansariel> Quickprefs integration
FloaterQuickPrefs::updateParam(QP_PARAM_WATER, LLSD(PRESET_NAME_REGION_DEFAULT));
// Otherwise apply region water.
LL_DEBUGS("Windlight") << "Applying region sky" << LL_ENDL;
return useWaterParams(region_water);

4
indra/newview/llestateinfomodel.cpp
View File

@ -122,9 +122,9 @@ public:
}
// if we get an error response
virtual void error(U32 status, const std::string& reason)
virtual void errorWithContent(U32 status, const std::string& reason, const LLSD& content)
{
llwarns << "Failed to commit estate info (" << status << "): " << reason << llendl;
llwarns << "Failed to commit estate info [status:" << status << "]: " << content << llendl;
}
};

12
indra/newview/lleventpoll.cpp
View File

@ -62,7 +62,7 @@ namespace
void handleMessage(const LLSD& content);
virtual void error(U32 status, const std::string& reason);
virtual void errorWithContent(U32 status, const std::string& reason, const LLSD& content);
virtual void result(const LLSD& content);
virtual void completedRaw(U32 status,
@ -187,7 +187,7 @@ namespace
}
//virtual
void LLEventPollResponder::error(U32 status, const std::string& reason)
void LLEventPollResponder::errorWithContent(U32 status, const std::string& reason, const LLSD& content)
{
if (mDone) return;
@ -207,13 +207,13 @@ namespace
+ mErrorCount * EVENT_POLL_ERROR_RETRY_SECONDS_INC
, this);
llwarns << "Unexpected HTTP error. status: " << status << ", reason: " << reason << llendl;
llwarns << "LLEventPollResponder error [status:" << status << "]: " << content << llendl;
}
else
{
llwarns << "LLEventPollResponder::error: <" << mCount << "> got "
<< status << ": " << reason
<< (mDone ? " -- done" : "") << llendl;
llwarns << "LLEventPollResponder error <" << mCount
<< "> [status:" << status << "]: " << content
<< (mDone ? " -- done" : "") << llendl;
stop();
// At this point we have given up and the viewer will not receive HTTP messages from the simulator.

6
indra/newview/llfasttimerview.cpp
View File

@ -1114,7 +1114,7 @@ void LLFastTimerView::exportCharts(const std::string& base, const std::string& t
{ //read base log into memory
S32 i = 0;
std::ifstream is(base.c_str());
while (!is.eof() && LLSDSerialize::fromXML(cur, is))
while (!is.eof() && LLSDParser::PARSE_FAILURE != LLSDSerialize::fromXML(cur, is))
{
base_data[i++] = cur;
}
@ -1127,7 +1127,7 @@ void LLFastTimerView::exportCharts(const std::string& base, const std::string& t
{ //read current log into memory
S32 i = 0;
std::ifstream is(target.c_str());
while (!is.eof() && LLSDSerialize::fromXML(cur, is))
while (!is.eof() && LLSDParser::PARSE_FAILURE != LLSDSerialize::fromXML(cur, is))
{
cur_data[i++] = cur;
@ -1418,7 +1418,7 @@ LLSD LLFastTimerView::analyzePerformanceLogDefault(std::istream& is)
stats_map_t time_stats;
stats_map_t sample_stats;
while (!is.eof() && LLSDSerialize::fromXML(cur, is))
while (!is.eof() && LLSDParser::PARSE_FAILURE != LLSDSerialize::fromXML(cur, is))
{
for (LLSD::map_iterator iter = cur.beginMap(); iter != cur.endMap(); ++iter)
{

3
indra/newview/llfloateravatarpicker.cpp
View File

@ -427,8 +427,7 @@ public:
}
else
{
llinfos << "avatar picker failed " << status
<< " reason " << reason << llendl;
llwarns << "avatar picker failed [status:" << status << "]: " << content << llendl;
}
}

2
indra/newview/llfloaterregiondebugconsole.cpp
View File

@ -75,7 +75,7 @@ namespace
{
public:
/* virtual */
void error(U32 status, const std::string& reason)
void errorWithContent(U32 status, const std::string& reason, const LLSD& content)
{
sConsoleReplySignal(UNABLE_TO_SEND_COMMAND);
}

16
indra/newview/llfloaterregioninfo.cpp
View File

@ -803,9 +803,10 @@ class ConsoleRequestResponder : public LLHTTPClient::Responder
{
public:
/*virtual*/
void error(U32 status, const std::string& reason)
void errorWithContent(U32 status, const std::string& reason, const LLSD& content)
{
llwarns << "requesting mesh_rez_enabled failed" << llendl;
llwarns << "ConsoleRequestResponder error requesting mesh_rez_enabled [status:"
<< status << "]: " << content << llendl;
}
};
@ -815,9 +816,10 @@ class ConsoleUpdateResponder : public LLHTTPClient::Responder
{
public:
/* virtual */
void error(U32 status, const std::string& reason)
void errorWithContent(U32 status, const std::string& reason, const LLSD& content)
{
llwarns << "Updating mesh enabled region setting failed" << llendl;
llwarns << "ConsoleRequestResponder error updating mesh enabled region setting [status:"
<< status << "]: " << content << llendl;
}
};
@ -2391,10 +2393,10 @@ public:
}
// if we get an error response
virtual void error(U32 status, const std::string& reason)
virtual void errorWithContent(U32 status, const std::string& reason, const LLSD& content)
{
llinfos << "LLEstateChangeInfoResponder::error "
<< status << ": " << reason << llendl;
llinfos << "LLEstateChangeInfoResponder::error [status:"
<< status << "]: " << content << llendl;
}
private:
LLHandle<LLPanel> mpPanel;

2
indra/newview/llfloaterreporter.cpp
View File

@ -703,7 +703,7 @@ class LLUserReportResponder : public LLHTTPClient::Responder
public:
LLUserReportResponder(): LLHTTPClient::Responder() {}
void error(U32 status, const std::string& reason)
void errorWithContent(U32 status, const std::string& reason, const LLSD& content)
{
// *TODO do some user messaging here
LLUploadDialog::modalUploadFinished();

16
indra/newview/llfloaterscriptlimits.cpp
View File

@ -223,9 +223,9 @@ void fetchScriptLimitsRegionInfoResponder::result(const LLSD& content)
}
}
void fetchScriptLimitsRegionInfoResponder::error(U32 status, const std::string& reason)
void fetchScriptLimitsRegionInfoResponder::errorWithContent(U32 status, const std::string& reason, const LLSD& content)
{
llwarns << "Error from responder " << reason << llendl;
llwarns << "fetchScriptLimitsRegionInfoResponder error [status:" << status << "]: " << content << llendl;
}
void fetchScriptLimitsRegionSummaryResponder::result(const LLSD& content_ref)
@ -310,9 +310,9 @@ void fetchScriptLimitsRegionSummaryResponder::result(const LLSD& content_ref)
}
}
void fetchScriptLimitsRegionSummaryResponder::error(U32 status, const std::string& reason)
void fetchScriptLimitsRegionSummaryResponder::errorWithContent(U32 status, const std::string& reason, const LLSD& content)
{
llwarns << "Error from responder " << reason << llendl;
llwarns << "fetchScriptLimitsRegionSummaryResponder error [status:" << status << "]: " << content << llendl;
}
void fetchScriptLimitsRegionDetailsResponder::result(const LLSD& content_ref)
@ -419,9 +419,9 @@ result (map)
}
}
void fetchScriptLimitsRegionDetailsResponder::error(U32 status, const std::string& reason)
void fetchScriptLimitsRegionDetailsResponder::errorWithContent(U32 status, const std::string& reason, const LLSD& content)
{
llwarns << "Error from responder " << reason << llendl;
llwarns << "fetchScriptLimitsRegionDetailsResponder error [status:" << status << "]: " << content << llendl;
}
void fetchScriptLimitsAttachmentInfoResponder::result(const LLSD& content_ref)
@ -515,9 +515,9 @@ void fetchScriptLimitsAttachmentInfoResponder::result(const LLSD& content_ref)
}
}
void fetchScriptLimitsAttachmentInfoResponder::error(U32 status, const std::string& reason)
void fetchScriptLimitsAttachmentInfoResponder::errorWithContent(U32 status, const std::string& reason, const LLSD& content)
{
llwarns << "Error from responder " << reason << llendl;
llwarns << "fetchScriptLimitsAttachmentInfoResponder error [status:" << status << "]: " << content << llendl;
}
///----------------------------------------------------------------------------

8
indra/newview/llfloaterscriptlimits.h
View File

@ -89,7 +89,7 @@ class fetchScriptLimitsRegionInfoResponder: public LLHTTPClient::Responder
fetchScriptLimitsRegionInfoResponder(const LLSD& info) : mInfo(info) {};
void result(const LLSD& content);
void error(U32 status, const std::string& reason);
void errorWithContent(U32 status, const std::string& reason, const LLSD& content);
public:
protected:
LLSD mInfo;
@ -101,7 +101,7 @@ class fetchScriptLimitsRegionSummaryResponder: public LLHTTPClient::Responder
fetchScriptLimitsRegionSummaryResponder(const LLSD& info) : mInfo(info) {};
void result(const LLSD& content);
void error(U32 status, const std::string& reason);
void errorWithContent(U32 status, const std::string& reason, const LLSD& content);
public:
protected:
LLSD mInfo;
@ -113,7 +113,7 @@ class fetchScriptLimitsRegionDetailsResponder: public LLHTTPClient::Responder
fetchScriptLimitsRegionDetailsResponder(const LLSD& info) : mInfo(info) {};
void result(const LLSD& content);
void error(U32 status, const std::string& reason);
void errorWithContent(U32 status, const std::string& reason, const LLSD& content);
public:
protected:
LLSD mInfo;
@ -125,7 +125,7 @@ class fetchScriptLimitsAttachmentInfoResponder: public LLHTTPClient::Responder
fetchScriptLimitsAttachmentInfoResponder() {};
void result(const LLSD& content);
void error(U32 status, const std::string& reason);
void errorWithContent(U32 status, const std::string& reason, const LLSD& content);
public:
protected:
};

7
indra/newview/llgroupmgr.cpp
View File

@ -1872,14 +1872,15 @@ public:
GroupMemberDataResponder() {}
virtual ~GroupMemberDataResponder() {}
virtual void result(const LLSD& pContent);
virtual void error(U32 pStatus, const std::string& pReason);
virtual void errorWithContent(U32 pStatus, const std::string& pReason, const LLSD& pContent);
private:
LLSD mMemberData;
};
void GroupMemberDataResponder::error(U32 pStatus, const std::string& pReason)
void GroupMemberDataResponder::errorWithContent(U32 pStatus, const std::string& pReason, const LLSD& pContent)
{
LL_WARNS("GrpMgr") << "Error receiving group member data." << LL_ENDL;
LL_WARNS("GrpMgr") << "Error receiving group member data [status:"
<< pStatus << "]: " << pContent << LL_ENDL;
}
void GroupMemberDataResponder::result(const LLSD& content)

4
indra/newview/llhomelocationresponder.cpp
View File

@ -97,7 +97,7 @@ void LLHomeLocationResponder::result( const LLSD& content )
}
}
void LLHomeLocationResponder::error( U32 status, const std::string& reason )
void LLHomeLocationResponder::errorWithContent( U32 status, const std::string& reason, const LLSD& content )
{
llinfos << "received error(" << reason << ")" << llendl;
llwarns << "LLHomeLocationResponder error [status:" << status << "]: " << content << llendl;
}

2
indra/newview/llhomelocationresponder.h
View File

@ -36,7 +36,7 @@
class LLHomeLocationResponder : public LLHTTPClient::Responder
{
virtual void result( const LLSD& content );
virtual void error( U32 status, const std::string& reason );
virtual void errorWithContent( U32 status, const std::string& reason, const LLSD& content );
};
#endif

5
indra/newview/llimfloater.cpp
View File

@ -987,9 +987,10 @@ public:
mSessionID = session_id;
}
void error(U32 statusNum, const std::string& reason)
void errorWithContent(U32 statusNum, const std::string& reason, const LLSD& content)
{
llinfos << "Error inviting all agents to session" << llendl;
llwarns << "Error inviting all agents to session [status:"
<< statusNum << "]: " << content << llendl;
//throw something back to the viewer here?
}

11
indra/newview/llimview.cpp
View File

@ -1465,7 +1465,7 @@ public:
mAgents = agents_to_invite;
}
virtual void error(U32 statusNum, const std::string& reason)
virtual void errorWithContent(U32 statusNum, const std::string& reason, const LLSD& content)
{
//try an "old school" way.
if ( statusNum == 400 )
@ -1477,6 +1477,9 @@ public:
mAgents);
}
llwarns << "LLStartConferenceChatResponder error [status:"
<< statusNum << "]: " << content << llendl;
//else throw an error back to the client?
//in theory we should have just have these error strings
//etc. set up in this file as opposed to the IMMgr,
@ -1622,8 +1625,10 @@ public:
}
}
void error(U32 statusNum, const std::string& reason)
{
void errorWithContent(U32 statusNum, const std::string& reason, const LLSD& content)
{
llwarns << "LLViewerChatterBoxInvitationAcceptResponder error [status:"
<< statusNum << "]: " << content << llendl;
//throw something back to the viewer here?
if ( gIMMgr )
{

4
indra/newview/llinspectavatar.cpp
View File

@ -501,9 +501,9 @@ void LLInspectAvatar::toggleSelectedVoice(bool enabled)
mSessionID = session_id;
}
virtual void error(U32 status, const std::string& reason)
virtual void errorWithContent(U32 status, const std::string& reason, const LLSD& content)
{
llwarns << status << ": " << reason << llendl;
llwarns << "MuteVoiceResponder error [status:" << status << "]: " << content << llendl;
if ( gIMMgr )
{

10
indra/newview/llinventorymodel.cpp
View File

@ -465,9 +465,10 @@ public:
{
}
virtual void error(U32 status, const std::string& reason)
virtual void errorWithContent(U32 status, const std::string& reason, const LLSD& content)
{
LL_WARNS("InvAPI") << "CreateInventoryCategory failed. status = " << status << ", reasion = \"" << reason << "\"" << LL_ENDL;
LL_WARNS("InvAPI") << "CreateInventoryCategory failed [status:"
<< status << "]: " << content << LL_ENDL;
}
virtual void result(const LLSD& content)
@ -1515,10 +1516,9 @@ void LLInventoryModel::fetchInventoryResponder::result(const LLSD& content)
}
//If we get back an error (not found, etc...), handle it here
void LLInventoryModel::fetchInventoryResponder::error(U32 status, const std::string& reason)
void LLInventoryModel::fetchInventoryResponder::errorWithContent(U32 status, const std::string& reason, const LLSD& content)
{
llinfos << "fetchInventory::error "
<< status << ": " << reason << llendl;
llwarns << "fetchInventory error [status:" << status << "]: " << content << llendl;
gInventory.notifyObservers();
}

2
indra/newview/llinventorymodel.h
View File

@ -88,7 +88,7 @@ public:
public:
fetchInventoryResponder(const LLSD& request_sd) : mRequestSD(request_sd) {};
void result(const LLSD& content);
void error(U32 status, const std::string& reason);
void errorWithContent(U32 status, const std::string& reason, const LLSD& content);
protected:
LLSD mRequestSD;
};

14
indra/newview/llinventorymodelbackgroundfetch.cpp
View File

@ -386,7 +386,7 @@ class LLInventoryModelFetchItemResponder : public LLInventoryModel::fetchInvento
public:
LLInventoryModelFetchItemResponder(const LLSD& request_sd) : LLInventoryModel::fetchInventoryResponder(request_sd) {};
void result(const LLSD& content);
void error(U32 status, const std::string& reason);
void errorWithContent(U32 status, const std::string& reason, const LLSD& content);
};
void LLInventoryModelFetchItemResponder::result( const LLSD& content )
@ -395,9 +395,9 @@ void LLInventoryModelFetchItemResponder::result( const LLSD& content )
LLInventoryModelBackgroundFetch::instance().incrFetchCount(-1);
}
void LLInventoryModelFetchItemResponder::error( U32 status, const std::string& reason )
void LLInventoryModelFetchItemResponder::errorWithContent( U32 status, const std::string& reason, const LLSD& content )
{
LLInventoryModel::fetchInventoryResponder::error(status, reason);
LLInventoryModel::fetchInventoryResponder::errorWithContent(status, reason, content);
LLInventoryModelBackgroundFetch::instance().incrFetchCount(-1);
}
@ -411,7 +411,7 @@ public:
{};
//LLInventoryModelFetchDescendentsResponder() {};
void result(const LLSD& content);
void error(U32 status, const std::string& reason);
void errorWithContent(U32 status, const std::string& reason, const LLSD& content);
protected:
BOOL getIsRecursive(const LLUUID& cat_id) const;
private:
@ -549,12 +549,12 @@ void LLInventoryModelFetchDescendentsResponder::result(const LLSD& content)
}
// If we get back an error (not found, etc...), handle it here.
void LLInventoryModelFetchDescendentsResponder::error(U32 status, const std::string& reason)
void LLInventoryModelFetchDescendentsResponder::errorWithContent(U32 status, const std::string& reason, const LLSD& content)
{
LLInventoryModelBackgroundFetch *fetcher = LLInventoryModelBackgroundFetch::getInstance();
llinfos << "LLInventoryModelFetchDescendentsResponder::error "
<< status << ": " << reason << llendl;
llinfos << "LLInventoryModelFetchDescendentsResponder::error [status:"
<< status << "]: " << content << llendl;
fetcher->incrFetchCount(-1);

10
indra/newview/llmediadataclient.cpp
View File

@ -567,7 +567,7 @@ LLMediaDataClient::Responder::Responder(const request_ptr_t &request)
}
/*virtual*/
void LLMediaDataClient::Responder::error(U32 status, const std::string& reason)
void LLMediaDataClient::Responder::errorWithContent(U32 status, const std::string& reason, const LLSD& content)
{
mRequest->stopTracking();
@ -599,8 +599,8 @@ void LLMediaDataClient::Responder::error(U32 status, const std::string& reason)
}
else
{
std::string msg = boost::lexical_cast<std::string>(status) + ": " + reason;
LL_WARNS("LLMediaDataClient") << *mRequest << " http error(" << msg << ")" << LL_ENDL;
LL_WARNS("LLMediaDataClient") << *mRequest << " http error [status:"
<< status << "]:" << content << ")" << LL_ENDL;
}
}
@ -1023,7 +1023,7 @@ LLMediaDataClient::Responder *LLObjectMediaNavigateClient::RequestNavigate::crea
}
/*virtual*/
void LLObjectMediaNavigateClient::Responder::error(U32 status, const std::string& reason)
void LLObjectMediaNavigateClient::Responder::errorWithContent(U32 status, const std::string& reason, const LLSD& content)
{
getRequest()->stopTracking();
@ -1037,7 +1037,7 @@ void LLObjectMediaNavigateClient::Responder::error(U32 status, const std::string
// class
if (status == HTTP_SERVICE_UNAVAILABLE)
{
LLMediaDataClient::Responder::error(status, reason);
LLMediaDataClient::Responder::errorWithContent(status, reason, content);
}
else
{

4
indra/newview/llmediadataclient.h
View File

@ -195,7 +195,7 @@ protected:
public:
Responder(const request_ptr_t &request);
//If we get back an error (not found, etc...), handle it here
virtual void error(U32 status, const std::string& reason);
virtual void errorWithContent(U32 status, const std::string& reason, const LLSD& content);
//If we get back a normal response, handle it here. Default just logs it.
virtual void result(const LLSD& content);
@ -401,7 +401,7 @@ protected:
public:
Responder(const request_ptr_t &request)
: LLMediaDataClient::Responder(request) {}
virtual void error(U32 status, const std::string& reason);
virtual void errorWithContent(U32 status, const std::string& reason, const LLSD& content);
virtual void result(const LLSD &content);
private:
void mediaNavigateBounceBack();

10
indra/newview/llpaneleditwearable.cpp
View File

@ -1105,15 +1105,7 @@ void LLPanelEditWearable::saveChanges(bool force_save_as)
gAgentWearables.saveWearable(mWearablePtr->getType(), index, TRUE, new_name);
}
if (gAgent.getRegion() && gAgent.getRegion()->getCentralBakeVersion() > 0)
{
LLAppearanceMgr::getInstance()->incrementCofVersion();
}
else
{
// *HACK This should be removed when all regions support the IncrementCOFVersion capability.
incrementCofVersionLegacy();
}
}
void LLPanelEditWearable::revertChanges()

59
indra/newview/llpathfindingmanager.cpp
View File

@ -108,7 +108,7 @@ public:
virtual ~NavMeshStatusResponder();
virtual void result(const LLSD &pContent);
virtual void error(U32 pStatus, const std::string& pReason);
virtual void errorWithContent(U32 pStatus, const std::string& pReason, const LLSD& pContent);
protected:
@ -130,7 +130,7 @@ public:
virtual ~NavMeshResponder();
virtual void result(const LLSD &pContent);
virtual void error(U32 pStatus, const std::string& pReason);
virtual void errorWithContent(U32 pStatus, const std::string& pReason, const LLSD& pContent);
protected:
@ -151,7 +151,7 @@ public:
virtual ~AgentStateResponder();
virtual void result(const LLSD &pContent);
virtual void error(U32 pStatus, const std::string& pReason);
virtual void errorWithContent(U32 pStatus, const std::string& pReason, const LLSD& pContent);
protected:
@ -170,7 +170,7 @@ public:
virtual ~NavMeshRebakeResponder();
virtual void result(const LLSD &pContent);
virtual void error(U32 pStatus, const std::string& pReason);
virtual void errorWithContent(U32 pStatus, const std::string& pReason, const LLSD& pContent);
protected:
@ -190,9 +190,11 @@ public:
virtual ~LinksetsResponder();
void handleObjectLinksetsResult(const LLSD &pContent);
void handleObjectLinksetsError(U32 pStatus, const std::string &pReason, const std::string &pURL);
void handleObjectLinksetsError(U32 pStatus, const std::string &pReason,
const LLSD& pContent, const std::string &pURL);
void handleTerrainLinksetsResult(const LLSD &pContent);
void handleTerrainLinksetsError(U32 pStatus, const std::string &pReason, const std::string &pURL);
void handleTerrainLinksetsError(U32 pStatus, const std::string &pReason,
const LLSD& pContent, const std::string &pURL);
protected:
@ -230,7 +232,7 @@ public:
virtual ~ObjectLinksetsResponder();
virtual void result(const LLSD &pContent);
virtual void error(U32 pStatus, const std::string &pReason);
virtual void errorWithContent(U32 pStatus, const std::string &pReason, const LLSD& pContent);
protected:
@ -250,7 +252,7 @@ public:
virtual ~TerrainLinksetsResponder();
virtual void result(const LLSD &pContent);
virtual void error(U32 pStatus, const std::string &pReason);
virtual void errorWithContent(U32 pStatus, const std::string &pReason, const LLSD& pContent);
protected:
@ -270,7 +272,7 @@ public:
virtual ~CharactersResponder();
virtual void result(const LLSD &pContent);
virtual void error(U32 pStatus, const std::string &pReason);
virtual void errorWithContent(U32 pStatus, const std::string &pReason, const LLSD& pContent);
protected:
@ -800,9 +802,9 @@ void NavMeshStatusResponder::result(const LLSD &pContent)
LLPathfindingManager::getInstance()->handleNavMeshStatusRequest(navMeshStatus, mRegion, mIsGetStatusOnly);
}
void NavMeshStatusResponder::error(U32 pStatus, const std::string& pReason)
void NavMeshStatusResponder::errorWithContent(U32 pStatus, const std::string& pReason, const LLSD& pContent)
{
llwarns << "error with request to URL '" << mCapabilityURL << "' because " << pReason << " (statusCode:" << pStatus << ")" << llendl;
llwarns << "NavMeshStatusResponder error [status:" << pStatus << "]: " << pContent << llendl;
LLPathfindingNavMeshStatus navMeshStatus(mRegionUUID);
LLPathfindingManager::getInstance()->handleNavMeshStatusRequest(navMeshStatus, mRegion, mIsGetStatusOnly);
}
@ -828,9 +830,9 @@ void NavMeshResponder::result(const LLSD &pContent)
mNavMeshPtr->handleNavMeshResult(pContent, mNavMeshVersion);
}
void NavMeshResponder::error(U32 pStatus, const std::string& pReason)
void NavMeshResponder::errorWithContent(U32 pStatus, const std::string& pReason, const LLSD& pContent)
{
mNavMeshPtr->handleNavMeshError(pStatus, pReason, mCapabilityURL, mNavMeshVersion);
mNavMeshPtr->handleNavMeshError(pStatus, pReason, pContent, mCapabilityURL, mNavMeshVersion);
}
//---------------------------------------------------------------------------
@ -855,9 +857,9 @@ void AgentStateResponder::result(const LLSD &pContent)
LLPathfindingManager::getInstance()->handleAgentState(canRebakeRegion);
}
void AgentStateResponder::error(U32 pStatus, const std::string &pReason)
void AgentStateResponder::errorWithContent(U32 pStatus, const std::string &pReason, const LLSD& pContent)
{
llwarns << "error with request to URL '" << mCapabilityURL << "' because " << pReason << " (statusCode:" << pStatus << ")" << llendl;
llwarns << "AgentStateResponder error [status:" << pStatus << "]: " << pContent << llendl;
LLPathfindingManager::getInstance()->handleAgentState(FALSE);
}
@ -881,9 +883,9 @@ void NavMeshRebakeResponder::result(const LLSD &pContent)
mRebakeNavMeshCallback(true);
}
void NavMeshRebakeResponder::error(U32 pStatus, const std::string &pReason)
void NavMeshRebakeResponder::errorWithContent(U32 pStatus, const std::string &pReason, const LLSD& pContent)
{
llwarns << "error with request to URL '" << mCapabilityURL << "' because " << pReason << " (statusCode:" << pStatus << ")" << llendl;
llwarns << "NavMeshRebakeResponder error [status:" << pStatus << "]: " << pContent << llendl;
mRebakeNavMeshCallback(false);
}
@ -916,9 +918,11 @@ void LinksetsResponder::handleObjectLinksetsResult(const LLSD &pContent)
}
}
void LinksetsResponder::handleObjectLinksetsError(U32 pStatus, const std::string &pReason, const std::string &pURL)
void LinksetsResponder::handleObjectLinksetsError(U32 pStatus, const std::string &pReason,
const LLSD& pContent, const std::string &pURL)
{
llwarns << "error with request to URL '" << pURL << "' because " << pReason << " (statusCode:" << pStatus << ")" << llendl;
llwarns << "LinksetsResponder object linksets error with request to URL '" << pURL << "' [status:"
<< pStatus << "]: " << pContent << llendl;
mObjectMessagingState = kReceivedError;
if (mTerrainMessagingState != kWaiting)
{
@ -937,8 +941,11 @@ void LinksetsResponder::handleTerrainLinksetsResult(const LLSD &pContent)
}
}
void LinksetsResponder::handleTerrainLinksetsError(U32 pStatus, const std::string &pReason, const std::string &pURL)
void LinksetsResponder::handleTerrainLinksetsError(U32 pStatus, const std::string &pReason,
const LLSD& pContent, const std::string &pURL)
{
llwarns << "LinksetsResponder terrain linksets error with request to URL '" << pURL << "' [status:"
<< pStatus << "]: " << pContent << llendl;
mTerrainMessagingState = kReceivedError;
if (mObjectMessagingState != kWaiting)
{
@ -988,9 +995,9 @@ void ObjectLinksetsResponder::result(const LLSD &pContent)
mLinksetsResponsderPtr->handleObjectLinksetsResult(pContent);
}
void ObjectLinksetsResponder::error(U32 pStatus, const std::string &pReason)
void ObjectLinksetsResponder::errorWithContent(U32 pStatus, const std::string &pReason, const LLSD& pContent)
{
mLinksetsResponsderPtr->handleObjectLinksetsError(pStatus, pReason, mCapabilityURL);
mLinksetsResponsderPtr->handleObjectLinksetsError(pStatus, pReason, pContent, mCapabilityURL);
}
//---------------------------------------------------------------------------
@ -1013,9 +1020,9 @@ void TerrainLinksetsResponder::result(const LLSD &pContent)
mLinksetsResponsderPtr->handleTerrainLinksetsResult(pContent);
}
void TerrainLinksetsResponder::error(U32 pStatus, const std::string &pReason)
void TerrainLinksetsResponder::errorWithContent(U32 pStatus, const std::string &pReason, const LLSD& pContent)
{
mLinksetsResponsderPtr->handleTerrainLinksetsError(pStatus, pReason, mCapabilityURL);
mLinksetsResponsderPtr->handleTerrainLinksetsError(pStatus, pReason, pContent, mCapabilityURL);
}
//---------------------------------------------------------------------------
@ -1040,9 +1047,9 @@ void CharactersResponder::result(const LLSD &pContent)
mCharactersCallback(mRequestId, LLPathfindingManager::kRequestCompleted, characterListPtr);
}
void CharactersResponder::error(U32 pStatus, const std::string &pReason)
void CharactersResponder::errorWithContent(U32 pStatus, const std::string &pReason, const LLSD& pContent)
{
llwarns << "error with request to URL '" << mCapabilityURL << "' because " << pReason << " (statusCode:" << pStatus << ")" << llendl;
llwarns << "CharactersResponder error [status:" << pStatus << "]: " << pContent << llendl;
LLPathfindingObjectListPtr characterListPtr = LLPathfindingObjectListPtr(new LLPathfindingCharacterList());
mCharactersCallback(mRequestId, LLPathfindingManager::kRequestError, characterListPtr);

5
indra/newview/llpathfindingnavmesh.cpp
View File

@ -184,9 +184,10 @@ void LLPathfindingNavMesh::handleNavMeshError()
setRequestStatus(kNavMeshRequestError);
}
void LLPathfindingNavMesh::handleNavMeshError(U32 pStatus, const std::string &pReason, const std::string &pURL, U32 pNavMeshVersion)
void LLPathfindingNavMesh::handleNavMeshError(U32 pStatus, const std::string &pReason, const LLSD& pContent, const std::string &pURL, U32 pNavMeshVersion)
{
llwarns << "error with request to URL '" << pURL << "' because " << pReason << " (statusCode:" << pStatus << ")" << llendl;
llwarns << "LLPathfindingNavMesh error with request to URL '" << pURL << "' [status:"
<< pStatus << "]: " << pContent << llendl;
if (mNavMeshStatus.getVersion() == pNavMeshVersion)
{
handleNavMeshError();

2
indra/newview/llpathfindingnavmesh.h
View File

@ -74,7 +74,7 @@ public:
void handleNavMeshResult(const LLSD &pContent, U32 pNavMeshVersion);
void handleNavMeshNotEnabled();
void handleNavMeshError();
void handleNavMeshError(U32 pStatus, const std::string &pReason, const std::string &pURL, U32 pNavMeshVersion);
void handleNavMeshError(U32 pStatus, const std::string &pReason, const LLSD& pContent, const std::string &pURL, U32 pNavMeshVersion);
protected:

6
indra/newview/llproductinforequest.cpp
View File

@ -43,10 +43,10 @@ public:
}
//If we get back an error (not found, etc...), handle it here
virtual void error(U32 status, const std::string& reason)
virtual void errorWithContent(U32 status, const std::string& reason, const LLSD& content)
{
llwarns << "LLProductInfoRequest::error("
<< status << ": " << reason << ")" << llendl;
llwarns << "LLProductInfoRequest error [status:"
<< status << ":] " << content << llendl;
}
};

Some files were not shown because too many files have changed in this diff Show More