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

Pull from viewer-beta

master
Merov Linden 2010-11-24 13:57:22 -08:00
parent f2194ee5f6 d9e2d4de48
commit 2e46db239f
13 changed files with 230 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
indra/llcommon/llthread.cpp
View File

@ -63,9 +63,6 @@ void *APR_THREAD_FUNC LLThread::staticRun(apr_thread_t *apr_threadp, void *datap
{
LLThread *threadp = (LLThread *)datap;
// Set thread state to running
threadp->mStatus = RUNNING;
// Run the user supplied function
threadp->run();
@ -167,10 +164,25 @@ void LLThread::shutdown()
void LLThread::start()
{
apr_thread_create(&mAPRThreadp, NULL, staticRun, (void *)this, mAPRPoolp);
llassert(isStopped());
// Set thread state to running
mStatus = RUNNING;
// We won't bother joining
apr_thread_detach(mAPRThreadp);
apr_status_t status =
apr_thread_create(&mAPRThreadp, NULL, staticRun, (void *)this, mAPRPoolp);
if(status == APR_SUCCESS)
{
// We won't bother joining
apr_thread_detach(mAPRThreadp);
}
else
{
mStatus = STOPPED;
llwarns << "failed to start thread " << mName << llendl;
ll_apr_warn_status(status);
}
}
//============================================================================

1
indra/newview/CMakeLists.txt
View File

@ -1877,6 +1877,7 @@ if (LL_TESTS)
lldateutil.cpp
llmediadataclient.cpp
lllogininstance.cpp
llremoteparcelrequest.cpp
llviewerhelputil.cpp
llversioninfo.cpp
)

1
indra/newview/llagent.h
View File

@ -33,6 +33,7 @@
#include "llagentconstants.h"
#include "llagentdata.h" // gAgentID, gAgentSessionID
#include "llcharacter.h" // LLAnimPauseRequest
#include "llcoordframe.h" // for mFrameAgent
#include "llpointer.h"
#include "lluicolor.h"
#include "llvoavatardefines.h"

7
indra/newview/llimview.cpp
View File

@ -573,7 +573,12 @@ void LLIMModel::LLIMSession::buildHistoryFileName()
//ad-hoc requires sophisticated chat history saving schemes
if (isAdHoc())
{
//in case of outgoing ad-hoc sessions
/* in case of outgoing ad-hoc sessions we need to make specilized names
* if this naming system is ever changed then the filtering definitions in
* lllogchat.cpp need to be change acordingly so that the filtering for the
* date stamp code introduced in STORM-102 will work properly and not add
* a date stamp to the Ad-hoc conferences.
*/
if (mInitialTargetIDs.size())
{
std::set<LLUUID> sorted_uuids(mInitialTargetIDs.begin(), mInitialTargetIDs.end());

46
indra/newview/lllogchat.cpp
View File

@ -89,6 +89,16 @@ const static boost::regex TIMESTAMP_AND_STUFF("^(\\[\\d{4}/\\d{1,2}/\\d{1,2}\\s+
*/
const static boost::regex NAME_AND_TEXT("([^:]+[:]{1})?(\\s*)(.*)");
/**
* These are recognizers for matching the names of ad-hoc conferences when generating the log file name
* On invited side, an ad-hoc is named like "<first name> <last name> Conference 2010/11/19 03:43 f0f4"
* On initiating side, an ad-hoc is named like Ad-hoc Conference hash<hash>"
* If the naming system for ad-hoc conferences are change in LLIMModel::LLIMSession::buildHistoryFileName()
* then these definition need to be adjusted as well.
*/
const static boost::regex INBOUND_CONFERENCE("^[a-zA-Z]{1,31} [a-zA-Z]{1,31} Conference [0-9]{4}/[0-9]{2}/[0-9]{2} [0-9]{2}:[0-9]{2} [0-9a-f]{4}");
const static boost::regex OUTBOUND_CONFERENCE("^Ad-hoc Conference hash[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}");
//is used to parse complex object names like "Xstreet SL Terminal v2.2.5 st"
const static std::string NAME_TEXT_DIVIDER(": ");
@ -182,25 +192,37 @@ private:
//static
std::string LLLogChat::makeLogFileName(std::string filename)
{
if( gSavedPerAccountSettings.getBOOL("LogFileNamewithDate") )
/**
* Testing for in bound and out bound ad-hoc file names
* if it is then skip date stamping.
**/
//LL_INFOS("") << "Befor:" << filename << LL_ENDL;/* uncomment if you want to verify step, delete on commit */
boost::match_results<std::string::const_iterator> matches;
bool inboundConf = boost::regex_match(filename, matches, INBOUND_CONFERENCE);
bool outboundConf = boost::regex_match(filename, matches, OUTBOUND_CONFERENCE);
if (!(inboundConf || outboundConf))
{
time_t now;
time(&now);
char dbuffer[20]; /* Flawfinder: ignore */
if (filename == "chat")
if( gSavedPerAccountSettings.getBOOL("LogFileNamewithDate") )
{
strftime(dbuffer, 20, "-%Y-%m-%d", localtime(&now));
time_t now;
time(&now);
char dbuffer[20]; /* Flawfinder: ignore */
if (filename == "chat")
{
strftime(dbuffer, 20, "-%Y-%m-%d", localtime(&now));
}
else
{
strftime(dbuffer, 20, "-%Y-%m", localtime(&now));
}
filename += dbuffer;
}
else
{
strftime(dbuffer, 20, "-%Y-%m", localtime(&now));
}
filename += dbuffer;
}
//LL_INFOS("") << "After:" << filename << LL_ENDL;/* uncomment if you want to verify step, delete on commit */
filename = cleanFileName(filename);
filename = gDirUtilp->getExpandedFilename(LL_PATH_PER_ACCOUNT_CHAT_LOGS,filename);
filename += ".txt";
//LL_INFOS("") << "Current:" << filename << LL_ENDL;/* uncomment if you want to verify step, delete on commit */
//LL_INFOS("") << "Full:" << filename << LL_ENDL;/* uncomment if you want to verify step, delete on commit */
return filename;
}

3
indra/newview/llpanellandmarks.cpp
View File

@ -520,9 +520,6 @@ void LLLandmarksPanel::setParcelID(const LLUUID& parcel_id)
{
if (!parcel_id.isNull())
{
//ext-4655, defensive. remove now incase this gets called twice without a remove
LLRemoteParcelInfoProcessor::getInstance()->removeObserver(parcel_id, this);
LLRemoteParcelInfoProcessor::getInstance()->addObserver(parcel_id, this);
LLRemoteParcelInfoProcessor::getInstance()->sendParcelInfoRequest(parcel_id);
}

3
indra/newview/llpanelpick.cpp
View File

@ -204,9 +204,6 @@ void LLPanelPickInfo::sendParcelInfoRequest()
{
if (mParcelId != mRequestedId)
{
//ext-4655, remove now incase this gets called twice without a remove
LLRemoteParcelInfoProcessor::getInstance()->removeObserver(mRequestedId, this);
LLRemoteParcelInfoProcessor::getInstance()->addObserver(mParcelId, this);
LLRemoteParcelInfoProcessor::getInstance()->sendParcelInfoRequest(mParcelId);

4
indra/newview/llpanelplaceinfo.cpp
View File

@ -128,10 +128,6 @@ void LLPanelPlaceInfo::sendParcelInfoRequest()
{
if (mParcelID != mRequestedID)
{
//ext-4655, defensive. remove now incase this gets called twice without a remove
//as panel never closes its ok atm (but wrong :)
LLRemoteParcelInfoProcessor::getInstance()->removeObserver(mRequestedID, this);
LLRemoteParcelInfoProcessor::getInstance()->addObserver(mParcelID, this);
LLRemoteParcelInfoProcessor::getInstance()->sendParcelInfoRequest(mParcelID);

53
indra/newview/llremoteparcelrequest.cpp
View File

@ -77,23 +77,19 @@ void LLRemoteParcelRequestResponder::error(U32 status, const std::string& reason
void LLRemoteParcelInfoProcessor::addObserver(const LLUUID& parcel_id, LLRemoteParcelInfoObserver* observer)
{
// Check if the observer is already in observers list for this UUID
observer_multimap_t::iterator it;
observer_multimap_t::iterator end = mObservers.upper_bound(parcel_id);
it = mObservers.find(parcel_id);
while (it != mObservers.end())
// Check if the observer is already in observers list for this UUID
for(it = mObservers.find(parcel_id); it != end; ++it)
{
if (it->second == observer)
if (it->second.get() == observer)
{
return;
}
else
{
++it;
}
}
mObservers.insert(std::pair<LLUUID, LLRemoteParcelInfoObserver*>(parcel_id, observer));
mObservers.insert(std::make_pair(parcel_id, observer->getObserverHandle()));
}
void LLRemoteParcelInfoProcessor::removeObserver(const LLUUID& parcel_id, LLRemoteParcelInfoObserver* observer)
@ -104,19 +100,15 @@ void LLRemoteParcelInfoProcessor::removeObserver(const LLUUID& parcel_id, LLRemo
}
observer_multimap_t::iterator it;
observer_multimap_t::iterator end = mObservers.upper_bound(parcel_id);
it = mObservers.find(parcel_id);
while (it != mObservers.end())
for(it = mObservers.find(parcel_id); it != end; ++it)
{
if (it->second == observer)
if (it->second.get() == observer)
{
mObservers.erase(it);
break;
}
else
{
++it;
}
}
}
@ -141,13 +133,34 @@ void LLRemoteParcelInfoProcessor::processParcelInfoReply(LLMessageSystem* msg, v
msg->getS32 ("Data", "SalePrice", parcel_data.sale_price);
msg->getS32 ("Data", "AuctionID", parcel_data.auction_id);
LLRemoteParcelInfoProcessor::observer_multimap_t observers = LLRemoteParcelInfoProcessor::getInstance()->mObservers;
LLRemoteParcelInfoProcessor::observer_multimap_t & observers = LLRemoteParcelInfoProcessor::getInstance()->mObservers;
observer_multimap_t::iterator oi = observers.find(parcel_data.parcel_id);
typedef std::vector<observer_multimap_t::iterator> deadlist_t;
deadlist_t dead_iters;
observer_multimap_t::iterator oi;
observer_multimap_t::iterator end = observers.upper_bound(parcel_data.parcel_id);
for (; oi != end; ++oi)
for (oi = observers.find(parcel_data.parcel_id); oi != end; ++oi)
{
oi->second->processParcelInfo(parcel_data);
LLRemoteParcelInfoObserver * observer = oi->second.get();
if(observer)
{
observer->processParcelInfo(parcel_data);
}
else
{
// the handle points to an expired observer, so don't keep it
// around anymore
dead_iters.push_back(oi);
}
}
deadlist_t::iterator i;
deadlist_t::iterator end_dead = dead_iters.end();
for(i = dead_iters.begin(); i != end_dead; ++i)
{
observers.erase(*i);
}
}

2
indra/newview/llremoteparcelrequest.h
View File

@ -98,7 +98,7 @@ public:
static void processParcelInfoReply(LLMessageSystem* msg, void**);
private:
typedef std::multimap<LLUUID, LLRemoteParcelInfoObserver*> observer_multimap_t;
typedef std::multimap<LLUUID, LLHandle<LLRemoteParcelInfoObserver> > observer_multimap_t;
observer_multimap_t mObservers;
};

2
indra/newview/skins/default/colors.xml
View File

@ -140,7 +140,7 @@
reference="AvatarListItemIconOfflineColor" />
<color
name="BackgroundChatColor"
reference="DkGray_66" />
reference="White" />
<color
name="ButtonBorderColor"
reference="Unused?" />

2
indra/newview/skins/default/xui/en/floater_preferences.xml
View File

@ -83,7 +83,7 @@
label="Move &amp; View"
layout="topleft"
help_topic="preferences_move_tab"
name="audio" />
name="move" />
<panel
class="panel_preference"
filename="panel_preferences_alerts.xml"

134
indra/newview/tests/llremoteparcelrequest_test.cpp Normal file
View File

@ -0,0 +1,134 @@
/**
* @file llremoteparcelrequest_test.cpp
* @author Brad Kittenbrink <brad@lindenlab.com>
*
* $LicenseInfo:firstyear=2010&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 "linden_common.h"
#include "../test/lltut.h"
#include "../llremoteparcelrequest.h"
#include "../llagent.h"
#include "message.h"
namespace {
LLControlGroup s_saved_settings("dummy_settings");
const LLUUID TEST_PARCEL_ID("11111111-1111-1111-1111-111111111111");
}
LLCurl::Responder::Responder() { }
LLCurl::Responder::~Responder() { }
void LLCurl::Responder::error(U32,std::string const &) { }
void LLCurl::Responder::result(LLSD const &) { }
void LLCurl::Responder::errorWithContent(U32 status,std::string const &,LLSD const &) { }
void LLCurl::Responder::completedRaw(U32 status, std::string const &, LLChannelDescriptors const &,boost::shared_ptr<LLBufferArray> const &) { }
void LLCurl::Responder::completed(U32 status, std::string const &, LLSD const &) { }
void LLCurl::Responder::completedHeader(U32 status, std::string const &, LLSD const &) { }
void LLMessageSystem::getF32(char const *,char const *,F32 &,S32) { }
void LLMessageSystem::getU8(char const *,char const *,U8 &,S32) { }
void LLMessageSystem::getS32(char const *,char const *,S32 &,S32) { }
void LLMessageSystem::getString(char const *,char const *, std::string &,S32) { }
void LLMessageSystem::getUUID(char const *,char const *, LLUUID & out_id,S32)
{
out_id = TEST_PARCEL_ID;
}
void LLMessageSystem::nextBlock(char const *) { }
void LLMessageSystem::addUUID(char const *,LLUUID const &) { }
void LLMessageSystem::addUUIDFast(char const *,LLUUID const &) { }
void LLMessageSystem::nextBlockFast(char const *) { }
void LLMessageSystem::newMessage(char const *) { }
LLMessageSystem * gMessageSystem;
char * _PREHASH_AgentID;
char * _PREHASH_AgentData;
LLAgent gAgent;
LLAgent::LLAgent() : mAgentAccess(s_saved_settings) { }
LLAgent::~LLAgent() { }
void LLAgent::sendReliableMessage(void) { }
LLUUID gAgentSessionID;
LLUUID gAgentID;
LLUIColor::LLUIColor(void) { }
LLAgentAccess::LLAgentAccess(LLControlGroup & settings) : mSavedSettings(settings) { }
LLControlGroup::LLControlGroup(std::string const & name) : LLInstanceTracker<LLControlGroup, std::string>(name) { }
LLControlGroup::~LLControlGroup(void) { }
namespace tut
{
struct TestObserver : public LLRemoteParcelInfoObserver {
TestObserver() : mProcessed(false) { }
virtual void processParcelInfo(const LLParcelData& parcel_data)
{
mProcessed = true;
}
virtual void setParcelID(const LLUUID& parcel_id) { }
virtual void setErrorStatus(U32 status, const std::string& reason) { }
bool mProcessed;
};
struct RemoteParcelRequestData
{
RemoteParcelRequestData()
{
}
};
typedef test_group<RemoteParcelRequestData> remoteparcelrequest_t;
typedef remoteparcelrequest_t::object remoteparcelrequest_object_t;
tut::remoteparcelrequest_t tut_remoteparcelrequest("LLRemoteParcelRequest");
template<> template<>
void remoteparcelrequest_object_t::test<1>()
{
set_test_name("observer pointer");
boost::scoped_ptr<TestObserver> observer(new TestObserver());
LLRemoteParcelInfoProcessor & processor = LLRemoteParcelInfoProcessor::instance();
processor.addObserver(LLUUID(TEST_PARCEL_ID), observer.get());
processor.processParcelInfoReply(gMessageSystem, NULL);
ensure(observer->mProcessed);
}
template<> template<>
void remoteparcelrequest_object_t::test<2>()
{
set_test_name("CHOP-220: dangling observer pointer");
LLRemoteParcelInfoObserver * observer = new TestObserver();
LLRemoteParcelInfoProcessor & processor = LLRemoteParcelInfoProcessor::instance();
processor.addObserver(LLUUID(TEST_PARCEL_ID), observer);
delete observer;
observer = NULL;
processor.processParcelInfoReply(gMessageSystem, NULL);
}
}