diff options
| author | Don Kjer <don@lindenlab.com> | 2007-12-06 18:18:35 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2007-12-06 18:18:35 +0000 |
| commit | 9754d265eb70a0e137cce1562df8d59dd74093af (patch) | |
| tree | a2c13c9955fbb1d72fd1ba45a426ba927b1f6737 | |
| parent | facf67ae3226105910c983a8fa8760414bf703e9 (diff) | |
EFFECTIVE MERGE: svn merge -r 73781:75018 svn+ssh://svn/svn/linden/branches/FixGroupVotes into release
ACTUAL MERGE: svn merge -r 75163:75166 svn+ssh://svn/svn/linden/qa/FixGroupVotes-merge-75160 into release
| -rw-r--r-- | etc/message.xml | 16 | ||||
| -rw-r--r-- | indra/newview/llviewerregion.cpp | 2 | ||||
| -rw-r--r-- | scripts/messages/message_template.msg | 4 |
3 files changed, 20 insertions, 2 deletions
diff --git a/etc/message.xml b/etc/message.xml index 18f61198ce..4534be6db8 100644 --- a/etc/message.xml +++ b/etc/message.xml @@ -408,6 +408,22 @@ <boolean>false</boolean> </map> + <key>StartGroupProposal</key> + <map> + <key>flavor</key> + <string>llsd</string> + <key>trusted-sender</key> + <boolean>false</boolean> + </map> + + <key>GroupProposalBallot</key> + <map> + <key>flavor</key> + <string>llsd</string> + <key>trusted-sender</key> + <boolean>false</boolean> + </map> + </map> <key>capBans</key> <map> diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index 0022212399..ad4b6fd616 100644 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -1340,6 +1340,7 @@ void LLViewerRegion::setSeedCapability(const std::string& url) capabilityNames.append("CopyInventoryFromNotecard"); capabilityNames.append("DispatchRegionInfo"); capabilityNames.append("EventQueueGet"); + capabilityNames.append("GroupProposalBallot"); capabilityNames.append("MapLayer"); capabilityNames.append("MapLayerGod"); capabilityNames.append("NewFileAgentInventory"); @@ -1354,6 +1355,7 @@ void LLViewerRegion::setSeedCapability(const std::string& url) capabilityNames.append("SendUserReport"); capabilityNames.append("SendUserReportWithScreenshot"); capabilityNames.append("ServerReleaseNotes"); + capabilityNames.append("StartGroupProposal"); capabilityNames.append("UpdateGestureAgentInventory"); capabilityNames.append("UpdateNotecardAgentInventory"); capabilityNames.append("UpdateScriptAgentInventory"); diff --git a/scripts/messages/message_template.msg b/scripts/messages/message_template.msg index 938a30ae53..c7ce013dcd 100644 --- a/scripts/messages/message_template.msg +++ b/scripts/messages/message_template.msg @@ -7708,7 +7708,7 @@ version 2.0 // viewer -> simulator -> dataserver // reliable { - StartGroupProposal Low 363 NotTrusted Zerocoded + StartGroupProposal Low 363 NotTrusted Zerocoded UDPDeprecated { AgentData Single { AgentID LLUUID } @@ -7728,7 +7728,7 @@ version 2.0 // viewer -> simulator -> dataserver // reliable { - GroupProposalBallot Low 364 NotTrusted Unencoded + GroupProposalBallot Low 364 NotTrusted Unencoded UDPDeprecated { AgentData Single { AgentID LLUUID } |