From d30101a52d4c378578893eb254714bf419c56b8a Mon Sep 17 00:00:00 2001 From: "Nyx (Neal Orman)" Date: Wed, 11 Jan 2012 13:49:41 -0500 Subject: PATH-180 fixed a couple of minor issues gcc is complaining about. --- indra/newview/llnavmeshstation.cpp | 350 ++++++++++++++++++------------------- indra/newview/llnavmeshstation.h | 187 ++++++++++---------- 2 files changed, 269 insertions(+), 268 deletions(-) diff --git a/indra/newview/llnavmeshstation.cpp b/indra/newview/llnavmeshstation.cpp index 24c4979298..bb08f00f40 100644 --- a/indra/newview/llnavmeshstation.cpp +++ b/indra/newview/llnavmeshstation.cpp @@ -1,175 +1,175 @@ -/** - * @file llnavmeshstation.cpp - * @brief - * - * $LicenseInfo:firstyear=2005&license=viewerlgpl$ - * Second Life Viewer Source Code - * Copyright (C) 2010, Linden Research, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; - * version 2.1 of the License only. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * 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 - * - * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA - * $/LicenseInfo$ - */ - -#include "llviewerprecompiledheaders.h" -#include "llnavmeshstation.h" -#include "llcurl.h" -#include "llpathinglib.h" -#include "llagent.h" -#include "llviewerregion.h" -#include "llsdutil.h" -//=============================================================================== -LLNavMeshStation::LLNavMeshStation() -{ -} -//=============================================================================== -class LLNavMeshUploadResponder : public LLCurl::Responder -{ -public: - LLNavMeshUploadResponder( const LLHandle& observer_handle ) - : mObserverHandle( observer_handle ) - { - } - - void clearPendingRequests ( void ) - { - } - - void error( U32 statusNum, const std::string& reason ) - { - statusNum; - llwarns << "Transport error "<execute(); - } - } - } - -private: - //Observer handle - LLHandle mObserverHandle; -}; -//=============================================================================== -class LLNavMeshDownloadResponder : public LLCurl::Responder -{ -public: - LLNavMeshDownloadResponder( const LLHandle& observer_handle ) - : mObserverHandle( observer_handle ) - { - } - - void clearPendingRequests ( void ) - { - } - - void error( U32 statusNum, const std::string& reason ) - { - statusNum; - llwarns << "Transport error "<extractNavMeshSrcFromLLSD( stuff ); - } - else - { - llwarns<<"no mesh data "< mObserverHandle; -}; - -//=============================================================================== -bool LLNavMeshStation::postNavMeshToServer( LLSD& data, const LLHandle& observerHandle ) -{ - mCurlRequest = new LLCurlRequest(); - - if ( mNavMeshUploadURL.empty() ) - { - llinfos << "Unable to upload navmesh because of missing URL" << llendl; - } - else - { - LLCurlRequest::headers_t headers; - mCurlRequest->post( mNavMeshUploadURL, headers, data, - new LLNavMeshUploadResponder(/*this, data,*/ observerHandle ) ); - do - { - mCurlRequest->process(); - //sleep for 10ms to prevent eating a whole core - apr_sleep(10000); - } while ( mCurlRequest->getQueued() > 0 ); - } - - delete mCurlRequest; - - mCurlRequest = NULL; - - return true; -} -//=============================================================================== -void LLNavMeshStation::downloadNavMeshSrc( const LLHandle& observerHandle ) -{ - if ( mNavMeshDownloadURL.empty() ) - { - llinfos << "Unable to upload navmesh because of missing URL" << llendl; - } - else - { - LLSD data; - data["agent_id"] = gAgent.getID(); - data["region_id"] = gAgent.getRegion()->getRegionID(); - LLHTTPClient::post(mNavMeshDownloadURL, data, new LLNavMeshDownloadResponder( observerHandle ) ); - } -} -//=============================================================================== \ No newline at end of file +/** + * @file llnavmeshstation.cpp + * @brief + * + * $LicenseInfo:firstyear=2005&license=viewerlgpl$ + * Second Life Viewer Source Code + * Copyright (C) 2010, Linden Research, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License only. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * 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 + * + * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA + * $/LicenseInfo$ + */ + +#include "llviewerprecompiledheaders.h" +#include "llnavmeshstation.h" +#include "llcurl.h" +#include "llpathinglib.h" +#include "llagent.h" +#include "llviewerregion.h" +#include "llsdutil.h" +//=============================================================================== +LLNavMeshStation::LLNavMeshStation() +{ +} +//=============================================================================== +class LLNavMeshUploadResponder : public LLCurl::Responder +{ +public: + LLNavMeshUploadResponder( const LLHandle& observer_handle ) + : mObserverHandle( observer_handle ) + { + } + + void clearPendingRequests ( void ) + { + } + + void error( U32 statusNum, const std::string& reason ) + { + //statusNum; + llwarns << "Transport error "<execute(); + } + } + } + +private: + //Observer handle + LLHandle mObserverHandle; +}; +//=============================================================================== +class LLNavMeshDownloadResponder : public LLCurl::Responder +{ +public: + LLNavMeshDownloadResponder( const LLHandle& observer_handle ) + : mObserverHandle( observer_handle ) + { + } + + void clearPendingRequests ( void ) + { + } + + void error( U32 statusNum, const std::string& reason ) + { + //statusNum; + llwarns << "Transport error "<extractNavMeshSrcFromLLSD( stuff ); + } + else + { + llwarns<<"no mesh data "< mObserverHandle; +}; + +//=============================================================================== +bool LLNavMeshStation::postNavMeshToServer( LLSD& data, const LLHandle& observerHandle ) +{ + mCurlRequest = new LLCurlRequest(); + + if ( mNavMeshUploadURL.empty() ) + { + llinfos << "Unable to upload navmesh because of missing URL" << llendl; + } + else + { + LLCurlRequest::headers_t headers; + mCurlRequest->post( mNavMeshUploadURL, headers, data, + new LLNavMeshUploadResponder(/*this, data,*/ observerHandle ) ); + do + { + mCurlRequest->process(); + //sleep for 10ms to prevent eating a whole core + apr_sleep(10000); + } while ( mCurlRequest->getQueued() > 0 ); + } + + delete mCurlRequest; + + mCurlRequest = NULL; + + return true; +} +//=============================================================================== +void LLNavMeshStation::downloadNavMeshSrc( const LLHandle& observerHandle ) +{ + if ( mNavMeshDownloadURL.empty() ) + { + llinfos << "Unable to upload navmesh because of missing URL" << llendl; + } + else + { + LLSD data; + data["agent_id"] = gAgent.getID(); + data["region_id"] = gAgent.getRegion()->getRegionID(); + LLHTTPClient::post(mNavMeshDownloadURL, data, new LLNavMeshDownloadResponder( observerHandle ) ); + } +} +//=============================================================================== diff --git a/indra/newview/llnavmeshstation.h b/indra/newview/llnavmeshstation.h index 5436694b41..10d35786b8 100644 --- a/indra/newview/llnavmeshstation.h +++ b/indra/newview/llnavmeshstation.h @@ -1,93 +1,94 @@ -/** - * @file llnavmeshstation.h - * @brief Client-side navmesh support - * - * $LicenseInfo:firstyear=2001&license=viewerlgpl$ - * Second Life Viewer Source Code - * Copyright (C) 2010, Linden Research, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; - * version 2.1 of the License only. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * 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 - * - * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA - * $/LicenseInfo$ - */ - -#ifndef LL_NAV_MESH_STATION_H -#define LL_NAV_MESH_STATION_H - -//=============================================================================== -#include "llhandle.h" -//=============================================================================== -class LLCurlRequest; -class LLMessageSystem; -//=============================================================================== -class LLNavMeshObserver -{ -public: - //Ctor - LLNavMeshObserver() { mObserverHandle.bind(this); } - //Dtor - virtual ~LLNavMeshObserver() {} - //Accessor for the observers handle - const LLHandle& getObserverHandle() const { return mObserverHandle; } - -protected: - LLRootHandle mObserverHandle; -}; -//=============================================================================== -//prep#TODO# determine if a name change is needed? -class LLNavMeshDownloadObserver -{ -public: - //Ctor - LLNavMeshDownloadObserver() { mObserverHandle.bind(this); } - //Dtor - virtual ~LLNavMeshDownloadObserver() {} - //Accessor for the observers handle - const LLHandle& getObserverHandle() const { return mObserverHandle; } - -protected: - LLRootHandle mObserverHandle; -}; -//=============================================================================== -class LLNavMeshStation : public LLSingleton -{ -public: - //Ctor - LLNavMeshStation(); - //Facilitates the posting of a prepopulated llsd block to an existing url - bool postNavMeshToServer( LLSD& data, const LLHandle& observerHandle ); - //Setter for the navmesh upload url - void setNavMeshUploadURL( std::string& url ) { mNavMeshUploadURL = url; } - //Setter for the navmesh download url - void setNavMeshDownloadURL( std::string& url ) { mNavMeshDownloadURL = url; } - //Callback to handle the requested src data for this regions navmesh src - static void processNavMeshSrc( LLMessageSystem* msg, void** ); - //Initiate download of the navmesh source from the server - void downloadNavMeshSrc( const LLHandle& observerHandle ); - -protected: - //Curl object to facilitate posts to server - LLCurlRequest* mCurlRequest; - //Maximum time in seconds to execute an uploading request. - S32 mMeshUploadTimeOut ; - //URL used for uploading viewer generated navmesh - std::string mNavMeshUploadURL; - //URL used for download the src data for a navmesh - std::string mNavMeshDownloadURL; - -}; -//=============================================================================== -#endif LL_NAV_MESH_STATION_H \ No newline at end of file +/** + * @file llnavmeshstation.h + * @brief Client-side navmesh support + * + * $LicenseInfo:firstyear=2001&license=viewerlgpl$ + * Second Life Viewer Source Code + * Copyright (C) 2010, Linden Research, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License only. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * 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 + * + * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA + * $/LicenseInfo$ + */ + +#ifndef LL_NAV_MESH_STATION_H +#define LL_NAV_MESH_STATION_H + +//=============================================================================== +#include "llhandle.h" +//=============================================================================== +class LLCurlRequest; +class LLMessageSystem; +//=============================================================================== +class LLNavMeshObserver +{ +public: + //Ctor + LLNavMeshObserver() { mObserverHandle.bind(this); } + //Dtor + virtual ~LLNavMeshObserver() {} + //Accessor for the observers handle + const LLHandle& getObserverHandle() const { return mObserverHandle; } + +protected: + LLRootHandle mObserverHandle; +}; +//=============================================================================== +//prep#TODO# determine if a name change is needed? +class LLNavMeshDownloadObserver +{ +public: + //Ctor + LLNavMeshDownloadObserver() { mObserverHandle.bind(this); } + //Dtor + virtual ~LLNavMeshDownloadObserver() {} + //Accessor for the observers handle + const LLHandle& getObserverHandle() const { return mObserverHandle; } + +protected: + LLRootHandle mObserverHandle; +}; +//=============================================================================== +class LLNavMeshStation : public LLSingleton +{ +public: + //Ctor + LLNavMeshStation(); + //Facilitates the posting of a prepopulated llsd block to an existing url + bool postNavMeshToServer( LLSD& data, const LLHandle& observerHandle ); + //Setter for the navmesh upload url + void setNavMeshUploadURL( std::string& url ) { mNavMeshUploadURL = url; } + //Setter for the navmesh download url + void setNavMeshDownloadURL( std::string& url ) { mNavMeshDownloadURL = url; } + //Callback to handle the requested src data for this regions navmesh src + static void processNavMeshSrc( LLMessageSystem* msg, void** ); + //Initiate download of the navmesh source from the server + void downloadNavMeshSrc( const LLHandle& observerHandle ); + +protected: + //Curl object to facilitate posts to server + LLCurlRequest* mCurlRequest; + //Maximum time in seconds to execute an uploading request. + S32 mMeshUploadTimeOut ; + //URL used for uploading viewer generated navmesh + std::string mNavMeshUploadURL; + //URL used for download the src data for a navmesh + std::string mNavMeshDownloadURL; + +}; +//=============================================================================== +#endif //LL_NAV_MESH_STATION_H + -- cgit v1.2.3