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

merge to tip

meow-7.2.2
ziree 2011-05-04 16:06:00 +02:00
parent d63630d722 e75737a9aa
commit fb4d2a3063
3 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -245,6 +245,17 @@
<key>Value</key>
<integer>0</integer>
</map>
<key>FSDontSendAvPhysicsParms</key>
<map>
<key>Comment</key>
<string>Don't send avatar physics parameters to server with shape for v1 compatibility</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>AutoCloseOOC</key>
<map>
<key>Comment</key>

13
indra/newview/llagent.cpp
View File

@ -3879,16 +3879,21 @@ void LLAgent::sendAgentSetAppearance()
gMessageSystem->addBinaryDataFast(_PREHASH_TextureEntry, NULL, 0);
}
BOOL send_v1_message = gSavedSettings.getBOOL("FSDontSendAvPhysicsParms");
S32 transmitted_params = 0;
for (LLViewerVisualParam* param = (LLViewerVisualParam*)gAgentAvatarp->getFirstVisualParam();
param;
param = (LLViewerVisualParam*)gAgentAvatarp->getNextVisualParam())
{
if (param->getGroup() == VISUAL_PARAM_GROUP_TWEAKABLE) // do not transmit params of group VISUAL_PARAM_GROUP_TWEAKABLE_NO_TRANSMIT
// Do not transmit params of group
// VISUAL_PARAM_GROUP_TWEAKABLE_NO_TRANSMIT. If we're
// sending the version 1 compatible message, then strip out
// V2-only parameters that have IDs of 1100 or higher.
if ((param->getGroup() == VISUAL_PARAM_GROUP_TWEAKABLE) &&
((param->getID() < 1100) || (!send_v1_message)))
{
msg->nextBlockFast(_PREHASH_VisualParam );
// We don't send the param ids. Instead, we assume that the receiver has the same params in the same sequence.
const F32 param_value = param->getWeight();
const U8 new_weight = F32_to_U8(param_value, param->getMinWeight(), param->getMaxWeight());
@ -3897,7 +3902,7 @@ void LLAgent::sendAgentSetAppearance()
}
}
// llinfos << "Avatar XML num VisualParams transmitted = " << transmitted_params << llendl;
llinfos << "Avatar XML num VisualParams transmitted = " << transmitted_params << llendl;
sendReliableMessage();
}

14
indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml
View File

@ -141,6 +141,20 @@
width="270"
control_name="TurnAroundWhenWalkingBackwards"
tool_tip="Turns your avatar around to face the camera when you are walking backwards."/>
<check_box bottom_delta="-30"
follows="left|top"
font="SansSerifSmall"
height="16"
initial_value="false"
label="Don't send avatar physics to server"
left="15"
mouse_opaque="true"
name="dontsendavphysics"
radio_style="false"
width="270"
control_name="FSDontSendAvPhysicsParms"
tool_tip="Disables sending your avatar physics information to the Second Life server, for compatibility with version 1 viewers"/>
</panel>