diff options
| author | James Cook <james@lindenlab.com> | 2007-01-19 00:36:55 +0000 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2007-01-19 00:36:55 +0000 |
| commit | 2d96460462f8b50318510b1e59cf63de5fdfd144 (patch) | |
| tree | ae312050629fd8f261f359b2bacd55c2291493c9 /indra/newview | |
| parent | c189fc0b579352c34285fcf03db4b5bca5cd3804 (diff) | |
SL-32782, SL-32838, SL-32787 Viewer crashes related to god/estate owner commands not putting transaction ids into a packet. Reviewed with Kelly.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llfloatertelehub.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llselectmgr.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llfloatertelehub.cpp b/indra/newview/llfloatertelehub.cpp index 9c2fb04f46..371154f8a3 100644 --- a/indra/newview/llfloatertelehub.cpp +++ b/indra/newview/llfloatertelehub.cpp @@ -211,10 +211,10 @@ void LLFloaterTelehub::onClickRemoveSpawnPoint(void* data) { msg->newMessage("EstateOwnerMessage"); } - msg->addUUIDFast(_PREHASH_TransactionID, LLUUID::null); //not used msg->nextBlock("AgentData"); msg->addUUID("AgentID", gAgent.getID()); msg->addUUID("SessionID", gAgent.getSessionID()); + msg->addUUIDFast(_PREHASH_TransactionID, LLUUID::null); //not used msg->nextBlock("MethodData"); msg->addString("Method", "telehub"); msg->addUUID("Invoice", LLUUID::null); diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp index e1a17618cf..9c7723517a 100644 --- a/indra/newview/llselectmgr.cpp +++ b/indra/newview/llselectmgr.cpp @@ -2118,6 +2118,7 @@ void LLSelectMgr::packGodlikeHead(void* user_data) msg->nextBlockFast(_PREHASH_AgentData); msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID()); msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID()); + msg->addUUID("TransactionID", LLUUID::null); godlike_request_t* data = (godlike_request_t*)user_data; msg->nextBlock("MethodData"); msg->addString("Method", data->first.c_str()); |