Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removing ReSit, because it's not so very nice

Browse Source
This commit is contained in:
Siana Gearz
2013-01-12 00:50:24 +01:00
parent 94edef2c3f
commit 896036b3c2
5 changed files with 0 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12111,17 +12111,6 @@ This should be as low as possible, but too low may break functionality</string>
<key>Value</key> <key>Value</key>
<integer>1</integer> <integer>1</integer>
</map> </map>
<key>ReSit</key>
<map>
<key>Comment</key>
<string>Sit again if unsat</string>
<key>Persist</key>
<integer>0</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>SpecifiedChannel</key> <key>SpecifiedChannel</key>
<map> <map>
<key>Comment</key> <key>Comment</key>

4
indra/newview/llagent.cpp
View File

@@ -126,10 +126,6 @@ const F32 MAX_FIDGET_TIME = 20.f; // seconds
LLAgent gAgent; LLAgent gAgent;
std::string gAuthString; std::string gAuthString;
// <edit>
LLUUID gReSitTargetID;
LLVector3 gReSitOffset;
// </edit>
class LLTeleportRequest class LLTeleportRequest
{ {
public: public:

4
indra/newview/llagent.h
View File

@@ -959,9 +959,5 @@ extern LLAgentQueryManager gAgentQueryManager;
extern std::string gAuthString; extern std::string gAuthString;
// <edit>
extern LLUUID gReSitTargetID;
extern LLVector3 gReSitOffset;
// </edit>
void update_group_floaters(const LLUUID& group_id); void update_group_floaters(const LLUUID& group_id);
#endif #endif

10
indra/newview/llviewermenu.cpp
View File

@@ -819,11 +819,6 @@ void init_menus()
NULL, NULL,
&menu_check_control, &menu_check_control,
(void*)"Nimble")); (void*)"Nimble"));
menu->addChild(new LLMenuItemCheckGL( "ReSit",
&menu_toggle_control,
NULL,
&menu_check_control,
(void*)"ReSit"));
menu->addSeparator(); menu->addSeparator();
menu->addChild(new LLMenuItemCallGL( "Object Area Search", &handle_area_search, NULL)); menu->addChild(new LLMenuItemCallGL( "Object Area Search", &handle_area_search, NULL));
@@ -4038,11 +4033,6 @@ bool handle_sit_or_stand()
gRlvHandler.setSitSource(gAgent.getPositionGlobal()); gRlvHandler.setSitSource(gAgent.getPositionGlobal());
} }
// [/RLVa:KB] // [/RLVa:KB]
// <edit>
gReSitTargetID = object->mID;
gReSitOffset = pick.mObjectOffset;
// </edit>
gMessageSystem->newMessageFast(_PREHASH_AgentRequestSit); gMessageSystem->newMessageFast(_PREHASH_AgentRequestSit);
gMessageSystem->nextBlockFast(_PREHASH_AgentData); gMessageSystem->nextBlockFast(_PREHASH_AgentData);
gMessageSystem->addUUIDFast(_PREHASH_AgentID, gAgent.getID()); gMessageSystem->addUUIDFast(_PREHASH_AgentID, gAgent.getID());

22
indra/newview/llvoavatar.cpp
View File

@@ -2789,28 +2789,6 @@ U32 LLVOAvatar::processUpdateMessage(LLMessageSystem *mesgsys,
} }
} }
//llinfos << getRotation() << llendl;
//llinfos << getPosition() << llendl;
// <edit>
if (update_type == OUT_FULL )
{
if(isSelf())
{
if(gSavedSettings.getBOOL("ReSit"))
{
gMessageSystem->newMessageFast(_PREHASH_AgentRequestSit);
gMessageSystem->nextBlockFast(_PREHASH_AgentData);
gMessageSystem->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
gMessageSystem->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
gMessageSystem->nextBlockFast(_PREHASH_TargetObject);
gMessageSystem->addUUIDFast(_PREHASH_TargetID, gReSitTargetID);
gMessageSystem->addVector3Fast(_PREHASH_Offset, gReSitOffset);
gAgent.getRegion()->sendReliableMessage();
}
}
}
// </edit>
return retval; return retval;
} }