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

svn merge -r 82263:82563 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-19-2-Server --> release 

Sprinkle "--location" pixie dust into farm curl calls
QAR-387 - pull in fix for missing abuse report snapshots (asset-id --> asset_id) / DEV-11758
comment --> template comment tweak by yoz for postcards
QAR-351 - Event queuing modifications
DEV-11639 - fix for llsdhttp.py to work with newer eventlet API
Rotating log_text_message is now part of the cron jobs
master
Josh Bell 2008-03-18 21:56:57 +00:00
parent 672a76d0ea
commit 2d9afdaa03
6 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etc/message.xml
View File

@ -258,6 +258,8 @@
<string>template</string>
<key>trusted-sender</key>
<boolean>true</boolean>
<key>only-send-latest</key>
<boolean>true</boolean>
</map>
<key>SimulatorLoad</key>
@ -537,6 +539,8 @@
<key>EstateChangeInfo</key>
<boolean>false</boolean>
<key>FetchInventoryDescendents</key>
<boolean>true</boolean>
</map>
<key>messageBans</key>

4
indra/llcommon/llversionserver.h
View File

@ -34,8 +34,8 @@
const S32 LL_VERSION_MAJOR = 1;
const S32 LL_VERSION_MINOR = 19;
const S32 LL_VERSION_PATCH = 1;
const S32 LL_VERSION_BUILD = 81992;
const S32 LL_VERSION_PATCH = 2;
const S32 LL_VERSION_BUILD = 82393;
const char * const LL_CHANNEL = "Second Life Server";

8
indra/llmessage/llmessageconfig.cpp
View File

@ -252,6 +252,14 @@ bool LLMessageConfig::isValidMessage(const std::string& msg_name)
return file.mMessages.has(msg_name);
}
//static
bool LLMessageConfig::onlySendLatest(const std::string& msg_name)
{
LLMessageConfigFile& file = LLMessageConfigFile::instance();
LLSD config = file.mMessages[msg_name];
return config["only-send-latest"].asBoolean();
}
bool LLMessageConfig::isCapBanned(const std::string& cap_name)
{
return LLMessageConfigFile::instance().isCapBanned(cap_name);

1
indra/llmessage/llmessageconfig.h
View File

@ -53,6 +53,7 @@ public:
static Flavor getMessageFlavor(const std::string& msg_name);
static SenderTrust getSenderTrustedness(const std::string& msg_name);
static bool isValidMessage(const std::string& msg_name);
static bool onlySendLatest(const std::string& msg_name);
static bool isCapBanned(const std::string& cap_name);
static LLSD getConfigForMessage(const std::string& msg_name);
};

2
indra/newview/llviewerregion.cpp
View File

@ -950,6 +950,7 @@ void LLViewerRegion::updateCoarseLocations(LLMessageSystem* msg)
{
//llinfos << "CoarseLocationUpdate" << llendl;
mMapAvatars.reset();
mMapAvatarIDs.reset(); // only matters in a rare case but it's good to be safe.
U8 x_pos = 0;
U8 y_pos = 0;
@ -1382,7 +1383,6 @@ void LLViewerRegion::setSeedCapability(const std::string& url)
capabilityNames.append("MapLayer");
capabilityNames.append("MapLayerGod");
capabilityNames.append("NewFileAgentInventory");
capabilityNames.append("ParcelGodReserveForNewbie");
capabilityNames.append("ParcelPropertiesUpdate");
capabilityNames.append("ParcelVoiceInfoRequest");
capabilityNames.append("ProvisionVoiceAccountRequest");

20
indra/test/llmessageconfig_tut.cpp
View File

@ -35,7 +35,6 @@
#include "lltut.h"
#include "llsdserialize.h"
#include "llfile.h"
#include "lldir.h"
#include "lltimer.h"
#include "llframetimer.h"
#include "llsdutil.h"
@ -199,4 +198,23 @@ namespace tut
LLMessageConfig::getServerDefaultFlavor(),
LLMessageConfig::LLSD_FLAVOR);
}
template<> template<>
void LLMessageConfigTestObject::test<8>()
// tests that config changes are picked up/refreshed periodically
{
LLSD config;
config["serverDefaults"]["simulator"] = "template";
config["messages"]["msg1"]["flavor"] = "llsd";
config["messages"]["msg1"]["only-send-latest"] = true;
config["messages"]["msg2"]["flavor"] = "llsd";
config["messages"]["msg2"]["only-send-latest"] = false;
LLMessageConfig::useConfig(config);
ensure_equals("Ensure msg1 exists, sent latest-only",
LLMessageConfig::onlySendLatest("msg1"),
true);
ensure_equals("Ensure msg2 exists, sent latest-only",
LLMessageConfig::onlySendLatest("msg2"),
false);
}
}