aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llmessage
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:44:57 -0500
committerJacek Antonelli2008-08-15 23:44:57 -0500
commitda68d3a57ecb27eba5d7efb8ff77d9640c0be65e (patch)
treef2fa2b9ed6e8cf49c8a3cb2a1893c4e5c61916a1 /linden/indra/llmessage
parentSecond Life viewer sources 1.15.1.3 (diff)
downloadmeta-impy-da68d3a57ecb27eba5d7efb8ff77d9640c0be65e.zip
meta-impy-da68d3a57ecb27eba5d7efb8ff77d9640c0be65e.tar.gz
meta-impy-da68d3a57ecb27eba5d7efb8ff77d9640c0be65e.tar.bz2
meta-impy-da68d3a57ecb27eba5d7efb8ff77d9640c0be65e.tar.xz
Second Life viewer sources 1.16.0.5
Diffstat (limited to 'linden/indra/llmessage')
-rw-r--r--linden/indra/llmessage/llcachename.cpp14
-rw-r--r--linden/indra/llmessage/llcurl.cpp33
-rw-r--r--linden/indra/llmessage/llcurl.h33
-rw-r--r--linden/indra/llmessage/llmessage_vc8.vcproj80
-rw-r--r--linden/indra/llmessage/lluseroperation.h2
-rw-r--r--linden/indra/llmessage/message_prehash.cpp14
-rw-r--r--linden/indra/llmessage/message_prehash.h7
7 files changed, 147 insertions, 36 deletions
diff --git a/linden/indra/llmessage/llcachename.cpp b/linden/indra/llmessage/llcachename.cpp
index 1cc7e09..3df4b82 100644
--- a/linden/indra/llmessage/llcachename.cpp
+++ b/linden/indra/llmessage/llcachename.cpp
@@ -528,26 +528,28 @@ void LLCacheName::get(const LLUUID& id, BOOL is_group, LLCacheNameCallback callb
528 LLCacheNameEntry* entry = get_ptr_in_map(impl.mCache, id ); 528 LLCacheNameEntry* entry = get_ptr_in_map(impl.mCache, id );
529 if (entry) 529 if (entry)
530 { 530 {
531 if (!entry->mIsGroup) 531 // id found in map therefore we can call the callback immediately.
532 if (entry->mIsGroup)
532 { 533 {
533 callback(id, entry->mFirstName, entry->mLastName, entry->mIsGroup, user_data); 534 callback(id, entry->mGroupName, "", entry->mIsGroup, user_data);
534 } 535 }
535 else 536 else
536 { 537 {
537 callback(id, entry->mGroupName, "", entry->mIsGroup, user_data); 538 callback(id, entry->mFirstName, entry->mLastName, entry->mIsGroup, user_data);
538 } 539 }
539 } 540 }
540 else 541 else
541 { 542 {
543 // id not found in map so we must queue the callback call until available.
542 if (!impl.isRequestPending(id)) 544 if (!impl.isRequestPending(id))
543 { 545 {
544 if (!is_group) 546 if (is_group)
545 { 547 {
546 impl.mAskNameQueue.insert(id); 548 impl.mAskGroupQueue.insert(id);
547 } 549 }
548 else 550 else
549 { 551 {
550 impl.mAskGroupQueue.insert(id); 552 impl.mAskNameQueue.insert(id);
551 } 553 }
552 } 554 }
553 impl.mReplyQueue.push_back(PendingReply(id, callback, user_data)); 555 impl.mReplyQueue.push_back(PendingReply(id, callback, user_data));
diff --git a/linden/indra/llmessage/llcurl.cpp b/linden/indra/llmessage/llcurl.cpp
index 886697e..9d883a7 100644
--- a/linden/indra/llmessage/llcurl.cpp
+++ b/linden/indra/llmessage/llcurl.cpp
@@ -1,10 +1,31 @@
1/* 1/**
2 * llcurl.cpp 2 * @file llcurl.h
3 * MacTester 3 * @author Zero / Donovan
4 * 4 * @date 2006-10-15
5 * Created by Zero Linden on 10/15/06. 5 * @brief Curl wrapper
6 * Copyright 2006 __MyCompanyName__. All rights reserved.
7 * 6 *
7 * Copyright (c) 2006-2007, Linden Research, Inc.
8 *
9 * Second Life Viewer Source Code
10 * The source code in this file ("Source Code") is provided by Linden Lab
11 * to you under the terms of the GNU General Public License, version 2.0
12 * ("GPL"), unless you have obtained a separate licensing agreement
13 * ("Other License"), formally executed by you and Linden Lab. Terms of
14 * the GPL can be found in doc/GPL-license.txt in this distribution, or
15 * online at http://secondlife.com/developers/opensource/gplv2
16 *
17 * There are special exceptions to the terms and conditions of the GPL as
18 * it is applied to this Source Code. View the full text of the exception
19 * in the file doc/FLOSS-exception.txt in this software distribution, or
20 * online at http://secondlife.com/developers/opensource/flossexception
21 *
22 * By copying, modifying or distributing this software, you acknowledge
23 * that you have read and understood your obligations described above,
24 * and agree to abide by those obligations.
25 *
26 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
27 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
28 * COMPLETENESS OR PERFORMANCE.
8 */ 29 */
9 30
10#include "llcurl.h" 31#include "llcurl.h"
diff --git a/linden/indra/llmessage/llcurl.h b/linden/indra/llmessage/llcurl.h
index 4f1b5e6..e188c38 100644
--- a/linden/indra/llmessage/llcurl.h
+++ b/linden/indra/llmessage/llcurl.h
@@ -1,10 +1,31 @@
1/* 1/**
2 * llcurl.h 2 * @file llcurl.h
3 * MacTester 3 * @author Zero / Donovan
4 * 4 * @date 2006-10-15
5 * Created by Zero Linden on 10/15/06. 5 * @brief Curl wrapper
6 * Copyright 2006 __MyCompanyName__. All rights reserved.
7 * 6 *
7 * Copyright (c) 2006-2007, Linden Research, Inc.
8 *
9 * Second Life Viewer Source Code
10 * The source code in this file ("Source Code") is provided by Linden Lab
11 * to you under the terms of the GNU General Public License, version 2.0
12 * ("GPL"), unless you have obtained a separate licensing agreement
13 * ("Other License"), formally executed by you and Linden Lab. Terms of
14 * the GPL can be found in doc/GPL-license.txt in this distribution, or
15 * online at http://secondlife.com/developers/opensource/gplv2
16 *
17 * There are special exceptions to the terms and conditions of the GPL as
18 * it is applied to this Source Code. View the full text of the exception
19 * in the file doc/FLOSS-exception.txt in this software distribution, or
20 * online at http://secondlife.com/developers/opensource/flossexception
21 *
22 * By copying, modifying or distributing this software, you acknowledge
23 * that you have read and understood your obligations described above,
24 * and agree to abide by those obligations.
25 *
26 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
27 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
28 * COMPLETENESS OR PERFORMANCE.
8 */ 29 */
9 30
10#ifndef LL_LLCURL_H 31#ifndef LL_LLCURL_H
diff --git a/linden/indra/llmessage/llmessage_vc8.vcproj b/linden/indra/llmessage/llmessage_vc8.vcproj
index ac32525..9692930 100644
--- a/linden/indra/llmessage/llmessage_vc8.vcproj
+++ b/linden/indra/llmessage/llmessage_vc8.vcproj
@@ -295,6 +295,10 @@
295 > 295 >
296 </File> 296 </File>
297 <File 297 <File
298 RelativePath=".\llhttpsender.cpp"
299 >
300 </File>
301 <File
298 RelativePath=".\llinstantmessage.cpp" 302 RelativePath=".\llinstantmessage.cpp"
299 > 303 >
300 </File> 304 </File>
@@ -327,6 +331,22 @@
327 > 331 >
328 </File> 332 </File>
329 <File 333 <File
334 RelativePath=".\llmessagebuilder.cpp"
335 >
336 </File>
337 <File
338 RelativePath=".\llmessageconfig.cpp"
339 >
340 </File>
341 <File
342 RelativePath=".\llmessagereader.cpp"
343 >
344 </File>
345 <File
346 RelativePath=".\llmessagetemplate.cpp"
347 >
348 </File>
349 <File
330 RelativePath=".\llmessagethrottle.cpp" 350 RelativePath=".\llmessagethrottle.cpp"
331 > 351 >
332 </File> 352 </File>
@@ -367,7 +387,11 @@
367 > 387 >
368 </File> 388 </File>
369 <File 389 <File
370 RelativePath=".\llsdmessagesystem.cpp" 390 RelativePath=".\llsdmessagebuilder.cpp"
391 >
392 </File>
393 <File
394 RelativePath=".\llsdmessagereader.cpp"
371 > 395 >
372 </File> 396 </File>
373 <File 397 <File
@@ -383,6 +407,18 @@
383 > 407 >
384 </File> 408 </File>
385 <File 409 <File
410 RelativePath=".\llservicebuilder.cpp"
411 >
412 </File>
413 <File
414 RelativePath=".\lltemplatemessagebuilder.cpp"
415 >
416 </File>
417 <File
418 RelativePath=".\lltemplatemessagereader.cpp"
419 >
420 </File>
421 <File
386 RelativePath=".\llthrottle.cpp" 422 RelativePath=".\llthrottle.cpp"
387 > 423 >
388 </File> 424 </File>
@@ -573,6 +609,14 @@
573 > 609 >
574 </File> 610 </File>
575 <File 611 <File
612 RelativePath=".\llhttpnode.h"
613 >
614 </File>
615 <File
616 RelativePath=".\llhttpsender.h"
617 >
618 </File>
619 <File
576 RelativePath=".\llinstantmessage.h" 620 RelativePath=".\llinstantmessage.h"
577 > 621 >
578 </File> 622 </File>
@@ -617,6 +661,22 @@
617 > 661 >
618 </File> 662 </File>
619 <File 663 <File
664 RelativePath=".\llmessagebuilder.h"
665 >
666 </File>
667 <File
668 RelativePath=".\llmessageconfig.h"
669 >
670 </File>
671 <File
672 RelativePath=".\llmessagereader.h"
673 >
674 </File>
675 <File
676 RelativePath=".\llmessagetemplate.h"
677 >
678 </File>
679 <File
620 RelativePath=".\llmessagethrottle.h" 680 RelativePath=".\llmessagethrottle.h"
621 > 681 >
622 </File> 682 </File>
@@ -673,7 +733,11 @@
673 > 733 >
674 </File> 734 </File>
675 <File 735 <File
676 RelativePath=".\llsdmessagesystem.h" 736 RelativePath=".\llsdmessagebuilder.h"
737 >
738 </File>
739 <File
740 RelativePath=".\llsdmessagereader.h"
677 > 741 >
678 </File> 742 </File>
679 <File 743 <File
@@ -689,6 +753,10 @@
689 > 753 >
690 </File> 754 </File>
691 <File 755 <File
756 RelativePath=".\llservicebuilder.h"
757 >
758 </File>
759 <File
692 RelativePath=".\lltaskname.h" 760 RelativePath=".\lltaskname.h"
693 > 761 >
694 </File> 762 </File>
@@ -697,6 +765,14 @@
697 > 765 >
698 </File> 766 </File>
699 <File 767 <File
768 RelativePath=".\lltemplatemessagebuilder.h"
769 >
770 </File>
771 <File
772 RelativePath=".\lltemplatemessagereader.h"
773 >
774 </File>
775 <File
700 RelativePath=".\llthrottle.h" 776 RelativePath=".\llthrottle.h"
701 > 777 >
702 </File> 778 </File>
diff --git a/linden/indra/llmessage/lluseroperation.h b/linden/indra/llmessage/lluseroperation.h
index 325567c..2b351f9 100644
--- a/linden/indra/llmessage/lluseroperation.h
+++ b/linden/indra/llmessage/lluseroperation.h
@@ -1,7 +1,7 @@
1/** 1/**
2 * @file lluseroperation.h 2 * @file lluseroperation.h
3 * @brief LLUserOperation class header file - used for message based 3 * @brief LLUserOperation class header file - used for message based
4 * transaction. For example, money transactions. 4 * transaction. For example, L$ transactions.
5 * 5 *
6 * Copyright (c) 2002-2007, Linden Research, Inc. 6 * Copyright (c) 2002-2007, Linden Research, Inc.
7 * 7 *
diff --git a/linden/indra/llmessage/message_prehash.cpp b/linden/indra/llmessage/message_prehash.cpp
index 39b3737..3e26726 100644
--- a/linden/indra/llmessage/message_prehash.cpp
+++ b/linden/indra/llmessage/message_prehash.cpp
@@ -554,8 +554,8 @@ char * _PREHASH_ReturnIDs;
554char * _PREHASH_Date; 554char * _PREHASH_Date;
555char * _PREHASH_AgentWearablesUpdate; 555char * _PREHASH_AgentWearablesUpdate;
556char * _PREHASH_AgentDataUpdate; 556char * _PREHASH_AgentDataUpdate;
557char * _PREHASH_Hash;
558char * _PREHASH_GroupDataUpdate; 557char * _PREHASH_GroupDataUpdate;
558char * _PREHASH_Hash;
559char * _PREHASH_AgentGroupDataUpdate; 559char * _PREHASH_AgentGroupDataUpdate;
560char * _PREHASH_Left; 560char * _PREHASH_Left;
561char * _PREHASH_Mask; 561char * _PREHASH_Mask;
@@ -683,7 +683,6 @@ char * _PREHASH_CreateNewOutfitAttachments;
683char * _PREHASH_RegionHandle; 683char * _PREHASH_RegionHandle;
684char * _PREHASH_TeleportProgress; 684char * _PREHASH_TeleportProgress;
685char * _PREHASH_AgentQuitCopy; 685char * _PREHASH_AgentQuitCopy;
686char * _PREHASH_ToViewer;
687char * _PREHASH_AvatarInterestsUpdate; 686char * _PREHASH_AvatarInterestsUpdate;
688char * _PREHASH_GroupNoticeID; 687char * _PREHASH_GroupNoticeID;
689char * _PREHASH_ParcelName; 688char * _PREHASH_ParcelName;
@@ -742,6 +741,7 @@ char * _PREHASH_LogoutReply;
742char * _PREHASH_FeatureDisabled; 741char * _PREHASH_FeatureDisabled;
743char * _PREHASH_ObjectLocalID; 742char * _PREHASH_ObjectLocalID;
744char * _PREHASH_Dropped; 743char * _PREHASH_Dropped;
744char * _PREHASH_PhysicalAvatarEventList;
745char * _PREHASH_WebProfilesDisabled; 745char * _PREHASH_WebProfilesDisabled;
746char * _PREHASH_Destination; 746char * _PREHASH_Destination;
747char * _PREHASH_MasterID; 747char * _PREHASH_MasterID;
@@ -1015,7 +1015,6 @@ char * _PREHASH_TrackAgentSession;
1015char * _PREHASH_CacheMissType; 1015char * _PREHASH_CacheMissType;
1016char * _PREHASH_VFileID; 1016char * _PREHASH_VFileID;
1017char * _PREHASH_GroupInsigniaID; 1017char * _PREHASH_GroupInsigniaID;
1018char * _PREHASH_FromID;
1019char * _PREHASH_Online; 1018char * _PREHASH_Online;
1020char * _PREHASH_KickFlags; 1019char * _PREHASH_KickFlags;
1021char * _PREHASH_CovenantID; 1020char * _PREHASH_CovenantID;
@@ -1199,7 +1198,6 @@ char * _PREHASH_EventData;
1199char * _PREHASH_Final; 1198char * _PREHASH_Final;
1200char * _PREHASH_TelehubPos; 1199char * _PREHASH_TelehubPos;
1201char * _PREHASH_ReportAutosaveCrash; 1200char * _PREHASH_ReportAutosaveCrash;
1202char * _PREHASH_Reset;
1203char * _PREHASH_CreateTrustedCircuit; 1201char * _PREHASH_CreateTrustedCircuit;
1204char * _PREHASH_DenyTrustedCircuit; 1202char * _PREHASH_DenyTrustedCircuit;
1205char * _PREHASH_RequestTrustedCircuit; 1203char * _PREHASH_RequestTrustedCircuit;
@@ -1382,7 +1380,6 @@ char * _PREHASH_SimulatorPublicHostBlock;
1382char * _PREHASH_HeaderData; 1380char * _PREHASH_HeaderData;
1383char * _PREHASH_RequestMultipleObjects; 1381char * _PREHASH_RequestMultipleObjects;
1384char * _PREHASH_RetrieveInstantMessages; 1382char * _PREHASH_RetrieveInstantMessages;
1385char * _PREHASH_DequeueInstantMessages;
1386char * _PREHASH_OpenCircuit; 1383char * _PREHASH_OpenCircuit;
1387char * _PREHASH_SecureSessionID; 1384char * _PREHASH_SecureSessionID;
1388char * _PREHASH_CrossedRegion; 1385char * _PREHASH_CrossedRegion;
@@ -2020,8 +2017,8 @@ void init_prehash_data()
2020 _PREHASH_Date = gMessageStringTable.getString("Date"); 2017 _PREHASH_Date = gMessageStringTable.getString("Date");
2021 _PREHASH_AgentWearablesUpdate = gMessageStringTable.getString("AgentWearablesUpdate"); 2018 _PREHASH_AgentWearablesUpdate = gMessageStringTable.getString("AgentWearablesUpdate");
2022 _PREHASH_AgentDataUpdate = gMessageStringTable.getString("AgentDataUpdate"); 2019 _PREHASH_AgentDataUpdate = gMessageStringTable.getString("AgentDataUpdate");
2023 _PREHASH_Hash = gMessageStringTable.getString("Hash");
2024 _PREHASH_GroupDataUpdate = gMessageStringTable.getString("GroupDataUpdate"); 2020 _PREHASH_GroupDataUpdate = gMessageStringTable.getString("GroupDataUpdate");
2021 _PREHASH_Hash = gMessageStringTable.getString("Hash");
2025 _PREHASH_AgentGroupDataUpdate = gMessageStringTable.getString("AgentGroupDataUpdate"); 2022 _PREHASH_AgentGroupDataUpdate = gMessageStringTable.getString("AgentGroupDataUpdate");
2026 _PREHASH_Left = gMessageStringTable.getString("Left"); 2023 _PREHASH_Left = gMessageStringTable.getString("Left");
2027 _PREHASH_Mask = gMessageStringTable.getString("Mask"); 2024 _PREHASH_Mask = gMessageStringTable.getString("Mask");
@@ -2149,7 +2146,6 @@ void init_prehash_data()
2149 _PREHASH_RegionHandle = gMessageStringTable.getString("RegionHandle"); 2146 _PREHASH_RegionHandle = gMessageStringTable.getString("RegionHandle");
2150 _PREHASH_TeleportProgress = gMessageStringTable.getString("TeleportProgress"); 2147 _PREHASH_TeleportProgress = gMessageStringTable.getString("TeleportProgress");
2151 _PREHASH_AgentQuitCopy = gMessageStringTable.getString("AgentQuitCopy"); 2148 _PREHASH_AgentQuitCopy = gMessageStringTable.getString("AgentQuitCopy");
2152 _PREHASH_ToViewer = gMessageStringTable.getString("ToViewer");
2153 _PREHASH_AvatarInterestsUpdate = gMessageStringTable.getString("AvatarInterestsUpdate"); 2149 _PREHASH_AvatarInterestsUpdate = gMessageStringTable.getString("AvatarInterestsUpdate");
2154 _PREHASH_GroupNoticeID = gMessageStringTable.getString("GroupNoticeID"); 2150 _PREHASH_GroupNoticeID = gMessageStringTable.getString("GroupNoticeID");
2155 _PREHASH_ParcelName = gMessageStringTable.getString("ParcelName"); 2151 _PREHASH_ParcelName = gMessageStringTable.getString("ParcelName");
@@ -2208,6 +2204,7 @@ void init_prehash_data()
2208 _PREHASH_FeatureDisabled = gMessageStringTable.getString("FeatureDisabled"); 2204 _PREHASH_FeatureDisabled = gMessageStringTable.getString("FeatureDisabled");
2209 _PREHASH_ObjectLocalID = gMessageStringTable.getString("ObjectLocalID"); 2205 _PREHASH_ObjectLocalID = gMessageStringTable.getString("ObjectLocalID");
2210 _PREHASH_Dropped = gMessageStringTable.getString("Dropped"); 2206 _PREHASH_Dropped = gMessageStringTable.getString("Dropped");
2207 _PREHASH_PhysicalAvatarEventList = gMessageStringTable.getString("PhysicalAvatarEventList");
2211 _PREHASH_WebProfilesDisabled = gMessageStringTable.getString("WebProfilesDisabled"); 2208 _PREHASH_WebProfilesDisabled = gMessageStringTable.getString("WebProfilesDisabled");
2212 _PREHASH_Destination = gMessageStringTable.getString("Destination"); 2209 _PREHASH_Destination = gMessageStringTable.getString("Destination");
2213 _PREHASH_MasterID = gMessageStringTable.getString("MasterID"); 2210 _PREHASH_MasterID = gMessageStringTable.getString("MasterID");
@@ -2481,7 +2478,6 @@ void init_prehash_data()
2481 _PREHASH_CacheMissType = gMessageStringTable.getString("CacheMissType"); 2478 _PREHASH_CacheMissType = gMessageStringTable.getString("CacheMissType");
2482 _PREHASH_VFileID = gMessageStringTable.getString("VFileID"); 2479 _PREHASH_VFileID = gMessageStringTable.getString("VFileID");
2483 _PREHASH_GroupInsigniaID = gMessageStringTable.getString("GroupInsigniaID"); 2480 _PREHASH_GroupInsigniaID = gMessageStringTable.getString("GroupInsigniaID");
2484 _PREHASH_FromID = gMessageStringTable.getString("FromID");
2485 _PREHASH_Online = gMessageStringTable.getString("Online"); 2481 _PREHASH_Online = gMessageStringTable.getString("Online");
2486 _PREHASH_KickFlags = gMessageStringTable.getString("KickFlags"); 2482 _PREHASH_KickFlags = gMessageStringTable.getString("KickFlags");
2487 _PREHASH_CovenantID = gMessageStringTable.getString("CovenantID"); 2483 _PREHASH_CovenantID = gMessageStringTable.getString("CovenantID");
@@ -2665,7 +2661,6 @@ void init_prehash_data()
2665 _PREHASH_Final = gMessageStringTable.getString("Final"); 2661 _PREHASH_Final = gMessageStringTable.getString("Final");
2666 _PREHASH_TelehubPos = gMessageStringTable.getString("TelehubPos"); 2662 _PREHASH_TelehubPos = gMessageStringTable.getString("TelehubPos");
2667 _PREHASH_ReportAutosaveCrash = gMessageStringTable.getString("ReportAutosaveCrash"); 2663 _PREHASH_ReportAutosaveCrash = gMessageStringTable.getString("ReportAutosaveCrash");
2668 _PREHASH_Reset = gMessageStringTable.getString("Reset");
2669 _PREHASH_CreateTrustedCircuit = gMessageStringTable.getString("CreateTrustedCircuit"); 2664 _PREHASH_CreateTrustedCircuit = gMessageStringTable.getString("CreateTrustedCircuit");
2670 _PREHASH_DenyTrustedCircuit = gMessageStringTable.getString("DenyTrustedCircuit"); 2665 _PREHASH_DenyTrustedCircuit = gMessageStringTable.getString("DenyTrustedCircuit");
2671 _PREHASH_RequestTrustedCircuit = gMessageStringTable.getString("RequestTrustedCircuit"); 2666 _PREHASH_RequestTrustedCircuit = gMessageStringTable.getString("RequestTrustedCircuit");
@@ -2848,7 +2843,6 @@ void init_prehash_data()
2848 _PREHASH_HeaderData = gMessageStringTable.getString("HeaderData"); 2843 _PREHASH_HeaderData = gMessageStringTable.getString("HeaderData");
2849 _PREHASH_RequestMultipleObjects = gMessageStringTable.getString("RequestMultipleObjects"); 2844 _PREHASH_RequestMultipleObjects = gMessageStringTable.getString("RequestMultipleObjects");
2850 _PREHASH_RetrieveInstantMessages = gMessageStringTable.getString("RetrieveInstantMessages"); 2845 _PREHASH_RetrieveInstantMessages = gMessageStringTable.getString("RetrieveInstantMessages");
2851 _PREHASH_DequeueInstantMessages = gMessageStringTable.getString("DequeueInstantMessages");
2852 _PREHASH_OpenCircuit = gMessageStringTable.getString("OpenCircuit"); 2846 _PREHASH_OpenCircuit = gMessageStringTable.getString("OpenCircuit");
2853 _PREHASH_SecureSessionID = gMessageStringTable.getString("SecureSessionID"); 2847 _PREHASH_SecureSessionID = gMessageStringTable.getString("SecureSessionID");
2854 _PREHASH_CrossedRegion = gMessageStringTable.getString("CrossedRegion"); 2848 _PREHASH_CrossedRegion = gMessageStringTable.getString("CrossedRegion");
diff --git a/linden/indra/llmessage/message_prehash.h b/linden/indra/llmessage/message_prehash.h
index 84c769e..06a8a9c 100644
--- a/linden/indra/llmessage/message_prehash.h
+++ b/linden/indra/llmessage/message_prehash.h
@@ -554,8 +554,8 @@ extern char * _PREHASH_ReturnIDs;
554extern char * _PREHASH_Date; 554extern char * _PREHASH_Date;
555extern char * _PREHASH_AgentWearablesUpdate; 555extern char * _PREHASH_AgentWearablesUpdate;
556extern char * _PREHASH_AgentDataUpdate; 556extern char * _PREHASH_AgentDataUpdate;
557extern char * _PREHASH_Hash;
558extern char * _PREHASH_GroupDataUpdate; 557extern char * _PREHASH_GroupDataUpdate;
558extern char * _PREHASH_Hash;
559extern char * _PREHASH_AgentGroupDataUpdate; 559extern char * _PREHASH_AgentGroupDataUpdate;
560extern char * _PREHASH_Left; 560extern char * _PREHASH_Left;
561extern char * _PREHASH_Mask; 561extern char * _PREHASH_Mask;
@@ -683,7 +683,6 @@ extern char * _PREHASH_CreateNewOutfitAttachments;
683extern char * _PREHASH_RegionHandle; 683extern char * _PREHASH_RegionHandle;
684extern char * _PREHASH_TeleportProgress; 684extern char * _PREHASH_TeleportProgress;
685extern char * _PREHASH_AgentQuitCopy; 685extern char * _PREHASH_AgentQuitCopy;
686extern char * _PREHASH_ToViewer;
687extern char * _PREHASH_AvatarInterestsUpdate; 686extern char * _PREHASH_AvatarInterestsUpdate;
688extern char * _PREHASH_GroupNoticeID; 687extern char * _PREHASH_GroupNoticeID;
689extern char * _PREHASH_ParcelName; 688extern char * _PREHASH_ParcelName;
@@ -742,6 +741,7 @@ extern char * _PREHASH_LogoutReply;
742extern char * _PREHASH_FeatureDisabled; 741extern char * _PREHASH_FeatureDisabled;
743extern char * _PREHASH_ObjectLocalID; 742extern char * _PREHASH_ObjectLocalID;
744extern char * _PREHASH_Dropped; 743extern char * _PREHASH_Dropped;
744extern char * _PREHASH_PhysicalAvatarEventList;
745extern char * _PREHASH_WebProfilesDisabled; 745extern char * _PREHASH_WebProfilesDisabled;
746extern char * _PREHASH_Destination; 746extern char * _PREHASH_Destination;
747extern char * _PREHASH_MasterID; 747extern char * _PREHASH_MasterID;
@@ -1015,7 +1015,6 @@ extern char * _PREHASH_TrackAgentSession;
1015extern char * _PREHASH_CacheMissType; 1015extern char * _PREHASH_CacheMissType;
1016extern char * _PREHASH_VFileID; 1016extern char * _PREHASH_VFileID;
1017extern char * _PREHASH_GroupInsigniaID; 1017extern char * _PREHASH_GroupInsigniaID;
1018extern char * _PREHASH_FromID;
1019extern char * _PREHASH_Online; 1018extern char * _PREHASH_Online;
1020extern char * _PREHASH_KickFlags; 1019extern char * _PREHASH_KickFlags;
1021extern char * _PREHASH_CovenantID; 1020extern char * _PREHASH_CovenantID;
@@ -1199,7 +1198,6 @@ extern char * _PREHASH_EventData;
1199extern char * _PREHASH_Final; 1198extern char * _PREHASH_Final;
1200extern char * _PREHASH_TelehubPos; 1199extern char * _PREHASH_TelehubPos;
1201extern char * _PREHASH_ReportAutosaveCrash; 1200extern char * _PREHASH_ReportAutosaveCrash;
1202extern char * _PREHASH_Reset;
1203extern char * _PREHASH_CreateTrustedCircuit; 1201extern char * _PREHASH_CreateTrustedCircuit;
1204extern char * _PREHASH_DenyTrustedCircuit; 1202extern char * _PREHASH_DenyTrustedCircuit;
1205extern char * _PREHASH_RequestTrustedCircuit; 1203extern char * _PREHASH_RequestTrustedCircuit;
@@ -1382,7 +1380,6 @@ extern char * _PREHASH_SimulatorPublicHostBlock;
1382extern char * _PREHASH_HeaderData; 1380extern char * _PREHASH_HeaderData;
1383extern char * _PREHASH_RequestMultipleObjects; 1381extern char * _PREHASH_RequestMultipleObjects;
1384extern char * _PREHASH_RetrieveInstantMessages; 1382extern char * _PREHASH_RetrieveInstantMessages;
1385extern char * _PREHASH_DequeueInstantMessages;
1386extern char * _PREHASH_OpenCircuit; 1383extern char * _PREHASH_OpenCircuit;
1387extern char * _PREHASH_SecureSessionID; 1384extern char * _PREHASH_SecureSessionID;
1388extern char * _PREHASH_CrossedRegion; 1385extern char * _PREHASH_CrossedRegion;
generated by cgit v1.1 at 2024-11-15 06:50:22 +0000