diff options
author | Jacek Antonelli | 2008-08-15 23:45:34 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:45:34 -0500 |
commit | cd17687f01420952712a500107e0f93e7ab8d5f8 (patch) | |
tree | ce48c2b706f2c1176290e39fb555fbdf6648ce01 /linden/indra/lscript/lscript_execute | |
parent | Second Life viewer sources 1.19.0.5 (diff) | |
download | meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.zip meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.tar.gz meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.tar.bz2 meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.tar.xz |
Second Life viewer sources 1.19.1.0
Diffstat (limited to 'linden/indra/lscript/lscript_execute')
4 files changed, 665 insertions, 665 deletions
diff --git a/linden/indra/lscript/lscript_execute/lscript_execute.cpp b/linden/indra/lscript/lscript_execute/lscript_execute.cpp index 1d2438c..d1200f0 100644 --- a/linden/indra/lscript/lscript_execute/lscript_execute.cpp +++ b/linden/indra/lscript/lscript_execute/lscript_execute.cpp | |||
@@ -1333,7 +1333,7 @@ BOOL run_pushargs(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id) | |||
1333 | S32 size = toffset - offset; | 1333 | S32 size = toffset - offset; |
1334 | char *arg = new char[size]; | 1334 | char *arg = new char[size]; |
1335 | offset++; | 1335 | offset++; |
1336 | safe_instruction_bytestream2char(arg, buffer, offset); | 1336 | safe_instruction_bytestream2char(arg, buffer, offset, size); |
1337 | if (b_print) | 1337 | if (b_print) |
1338 | printf("%s\n", arg); | 1338 | printf("%s\n", arg); |
1339 | S32 address = lsa_heap_add_data(buffer, new LLScriptLibData(arg), get_max_heap_size(buffer), TRUE); | 1339 | S32 address = lsa_heap_add_data(buffer, new LLScriptLibData(arg), get_max_heap_size(buffer), TRUE); |
@@ -2753,7 +2753,7 @@ BOOL run_jumpif(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id) | |||
2753 | safe_heap_bytestream_count_char(buffer, toffset); | 2753 | safe_heap_bytestream_count_char(buffer, toffset); |
2754 | S32 size = toffset - string; | 2754 | S32 size = toffset - string; |
2755 | char *sdata = new char[size]; | 2755 | char *sdata = new char[size]; |
2756 | bytestream2char(sdata, buffer, string); | 2756 | bytestream2char(sdata, buffer, string, size); |
2757 | if (strlen(sdata)) /*Flawfinder: ignore*/ | 2757 | if (strlen(sdata)) /*Flawfinder: ignore*/ |
2758 | { | 2758 | { |
2759 | offset += arg; | 2759 | offset += arg; |
@@ -2781,7 +2781,7 @@ BOOL run_jumpif(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id) | |||
2781 | safe_heap_bytestream_count_char(buffer, toffset); | 2781 | safe_heap_bytestream_count_char(buffer, toffset); |
2782 | S32 size = toffset - string; | 2782 | S32 size = toffset - string; |
2783 | char *sdata = new char[size]; | 2783 | char *sdata = new char[size]; |
2784 | bytestream2char(sdata, buffer, string); | 2784 | bytestream2char(sdata, buffer, string, size); |
2785 | if (strlen(sdata)) /*Flawfinder: ignore*/ | 2785 | if (strlen(sdata)) /*Flawfinder: ignore*/ |
2786 | { | 2786 | { |
2787 | LLUUID id; | 2787 | LLUUID id; |
@@ -2880,7 +2880,7 @@ BOOL run_jumpnif(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id) | |||
2880 | safe_heap_bytestream_count_char(buffer, toffset); | 2880 | safe_heap_bytestream_count_char(buffer, toffset); |
2881 | S32 size = toffset - string; | 2881 | S32 size = toffset - string; |
2882 | char *sdata = new char[size]; | 2882 | char *sdata = new char[size]; |
2883 | bytestream2char(sdata, buffer, string); | 2883 | bytestream2char(sdata, buffer, string, size); |
2884 | if (!strlen(sdata)) /*Flawfinder: ignore*/ | 2884 | if (!strlen(sdata)) /*Flawfinder: ignore*/ |
2885 | { | 2885 | { |
2886 | offset += arg; | 2886 | offset += arg; |
@@ -2908,7 +2908,7 @@ BOOL run_jumpnif(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id) | |||
2908 | safe_heap_bytestream_count_char(buffer, toffset); | 2908 | safe_heap_bytestream_count_char(buffer, toffset); |
2909 | S32 size = toffset - string; | 2909 | S32 size = toffset - string; |
2910 | char *sdata = new char[size]; | 2910 | char *sdata = new char[size]; |
2911 | bytestream2char(sdata, buffer, string); | 2911 | bytestream2char(sdata, buffer, string, size); |
2912 | if (strlen(sdata)) /*Flawfinder: ignore*/ | 2912 | if (strlen(sdata)) /*Flawfinder: ignore*/ |
2913 | { | 2913 | { |
2914 | LLUUID id; | 2914 | LLUUID id; |
@@ -3182,7 +3182,7 @@ BOOL run_cast(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id) | |||
3182 | safe_heap_bytestream_count_char(buffer, toffset); | 3182 | safe_heap_bytestream_count_char(buffer, toffset); |
3183 | S32 size = toffset - string; | 3183 | S32 size = toffset - string; |
3184 | char *arg = new char[size]; | 3184 | char *arg = new char[size]; |
3185 | bytestream2char(arg, buffer, string); | 3185 | bytestream2char(arg, buffer, string, size); |
3186 | // S32 length = strlen(arg); | 3186 | // S32 length = strlen(arg); |
3187 | S32 dest; | 3187 | S32 dest; |
3188 | S32 base; | 3188 | S32 base; |
@@ -3225,7 +3225,7 @@ BOOL run_cast(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id) | |||
3225 | safe_heap_bytestream_count_char(buffer, toffset); | 3225 | safe_heap_bytestream_count_char(buffer, toffset); |
3226 | S32 size = toffset - string; | 3226 | S32 size = toffset - string; |
3227 | char *arg = new char[size]; | 3227 | char *arg = new char[size]; |
3228 | bytestream2char(arg, buffer, string); | 3228 | bytestream2char(arg, buffer, string, size); |
3229 | F32 dest = (F32)atof(arg); | 3229 | F32 dest = (F32)atof(arg); |
3230 | 3230 | ||
3231 | 3231 | ||
@@ -3265,7 +3265,7 @@ BOOL run_cast(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id) | |||
3265 | safe_heap_bytestream_count_char(buffer, toffset); | 3265 | safe_heap_bytestream_count_char(buffer, toffset); |
3266 | S32 size = toffset - string; | 3266 | S32 size = toffset - string; |
3267 | char *arg = new char[size]; | 3267 | char *arg = new char[size]; |
3268 | bytestream2char(arg, buffer, string); | 3268 | bytestream2char(arg, buffer, string, size); |
3269 | LLVector3 vec; | 3269 | LLVector3 vec; |
3270 | S32 num = sscanf(arg, "<%f, %f, %f>", &vec.mV[VX], &vec.mV[VY], &vec.mV[VZ]); | 3270 | S32 num = sscanf(arg, "<%f, %f, %f>", &vec.mV[VX], &vec.mV[VY], &vec.mV[VZ]); |
3271 | if (num != 3) | 3271 | if (num != 3) |
@@ -3295,7 +3295,7 @@ BOOL run_cast(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id) | |||
3295 | safe_heap_bytestream_count_char(buffer, toffset); | 3295 | safe_heap_bytestream_count_char(buffer, toffset); |
3296 | S32 size = toffset - string; | 3296 | S32 size = toffset - string; |
3297 | char *arg = new char[size]; | 3297 | char *arg = new char[size]; |
3298 | bytestream2char(arg, buffer, string); | 3298 | bytestream2char(arg, buffer, string, size); |
3299 | LLQuaternion quat; | 3299 | LLQuaternion quat; |
3300 | S32 num = sscanf(arg, "<%f, %f, %f, %f>", &quat.mQ[VX], &quat.mQ[VY], &quat.mQ[VZ], &quat.mQ[VW]); | 3300 | S32 num = sscanf(arg, "<%f, %f, %f, %f>", &quat.mQ[VX], &quat.mQ[VY], &quat.mQ[VZ], &quat.mQ[VW]); |
3301 | if (num != 4) | 3301 | if (num != 4) |
@@ -3496,7 +3496,7 @@ void lscript_stacktol_pop_variable(LLScriptLibData *data, U8 *buffer, char type) | |||
3496 | safe_heap_bytestream_count_char(buffer, toffset); | 3496 | safe_heap_bytestream_count_char(buffer, toffset); |
3497 | S32 size = toffset - string; | 3497 | S32 size = toffset - string; |
3498 | data->mKey = new char[size]; | 3498 | data->mKey = new char[size]; |
3499 | bytestream2char(data->mKey, buffer, string); | 3499 | bytestream2char(data->mKey, buffer, string, size); |
3500 | } | 3500 | } |
3501 | lsa_decrease_ref_count(buffer, base_address); | 3501 | lsa_decrease_ref_count(buffer, base_address); |
3502 | } | 3502 | } |
@@ -3523,7 +3523,7 @@ void lscript_stacktol_pop_variable(LLScriptLibData *data, U8 *buffer, char type) | |||
3523 | safe_heap_bytestream_count_char(buffer, toffset); | 3523 | safe_heap_bytestream_count_char(buffer, toffset); |
3524 | S32 size = toffset - string; | 3524 | S32 size = toffset - string; |
3525 | data->mString = new char[size]; | 3525 | data->mString = new char[size]; |
3526 | bytestream2char(data->mString, buffer, string); | 3526 | bytestream2char(data->mString, buffer, string, size); |
3527 | } | 3527 | } |
3528 | lsa_decrease_ref_count(buffer, base_address); | 3528 | lsa_decrease_ref_count(buffer, base_address); |
3529 | } | 3529 | } |
@@ -3623,7 +3623,7 @@ BOOL run_print(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id) | |||
3623 | safe_heap_bytestream_count_char(buffer, toffset); | 3623 | safe_heap_bytestream_count_char(buffer, toffset); |
3624 | S32 size = toffset - string; | 3624 | S32 size = toffset - string; |
3625 | char *arg = new char[size]; | 3625 | char *arg = new char[size]; |
3626 | bytestream2char(arg, buffer, string); | 3626 | bytestream2char(arg, buffer, string, size); |
3627 | printf("%s\n", arg); | 3627 | printf("%s\n", arg); |
3628 | delete [] arg; | 3628 | delete [] arg; |
3629 | } | 3629 | } |
@@ -3787,7 +3787,7 @@ void lscript_pop_variable(LLScriptLibData *data, U8 *buffer, char type) | |||
3787 | safe_heap_bytestream_count_char(buffer, toffset); | 3787 | safe_heap_bytestream_count_char(buffer, toffset); |
3788 | S32 size = toffset - string; | 3788 | S32 size = toffset - string; |
3789 | data->mKey = new char[size]; | 3789 | data->mKey = new char[size]; |
3790 | bytestream2char(data->mKey, buffer, string); | 3790 | bytestream2char(data->mKey, buffer, string, size); |
3791 | } | 3791 | } |
3792 | lsa_decrease_ref_count(buffer, base_address); | 3792 | lsa_decrease_ref_count(buffer, base_address); |
3793 | } | 3793 | } |
@@ -3814,7 +3814,7 @@ void lscript_pop_variable(LLScriptLibData *data, U8 *buffer, char type) | |||
3814 | safe_heap_bytestream_count_char(buffer, toffset); | 3814 | safe_heap_bytestream_count_char(buffer, toffset); |
3815 | S32 size = toffset - string; | 3815 | S32 size = toffset - string; |
3816 | data->mString = new char[size]; | 3816 | data->mString = new char[size]; |
3817 | bytestream2char(data->mString, buffer, string); | 3817 | bytestream2char(data->mString, buffer, string, size); |
3818 | } | 3818 | } |
3819 | lsa_decrease_ref_count(buffer, base_address); | 3819 | lsa_decrease_ref_count(buffer, base_address); |
3820 | } | 3820 | } |
diff --git a/linden/indra/lscript/lscript_execute/lscript_execute_vc8.vcproj b/linden/indra/lscript/lscript_execute/lscript_execute_vc8.vcproj index 2314e6a..8a1e4c6 100644 --- a/linden/indra/lscript/lscript_execute/lscript_execute_vc8.vcproj +++ b/linden/indra/lscript/lscript_execute/lscript_execute_vc8.vcproj | |||
@@ -1,279 +1,279 @@ | |||
1 | <?xml version="1.0" encoding="Windows-1252"?> | 1 | <?xml version="1.0" encoding="Windows-1252"?> |
2 | <VisualStudioProject | 2 | <VisualStudioProject |
3 | ProjectType="Visual C++" | 3 | ProjectType="Visual C++" |
4 | Version="8.00" | 4 | Version="8.00" |
5 | Name="lscript_execute" | 5 | Name="lscript_execute" |
6 | ProjectGUID="{F882263E-4F2A-43D9-A45A-FA4C8EC66552}" | 6 | ProjectGUID="{F882263E-4F2A-43D9-A45A-FA4C8EC66552}" |
7 | RootNamespace="lscript_execute" | 7 | RootNamespace="lscript_execute" |
8 | Keyword="Win32Proj" | 8 | Keyword="Win32Proj" |
9 | > | 9 | > |
10 | <Platforms> | 10 | <Platforms> |
11 | <Platform | 11 | <Platform |
12 | Name="Win32" | 12 | Name="Win32" |
13 | /> | 13 | /> |
14 | </Platforms> | 14 | </Platforms> |
15 | <ToolFiles> | 15 | <ToolFiles> |
16 | </ToolFiles> | 16 | </ToolFiles> |
17 | <Configurations> | 17 | <Configurations> |
18 | <Configuration | 18 | <Configuration |
19 | Name="Debug|Win32" | 19 | Name="Debug|Win32" |
20 | OutputDirectory="../../lib_$(ConfigurationName)/i686-win32" | 20 | OutputDirectory="../../lib_$(ConfigurationName)/i686-win32" |
21 | IntermediateDirectory="Debug" | 21 | IntermediateDirectory="Debug" |
22 | ConfigurationType="4" | 22 | ConfigurationType="4" |
23 | InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" | 23 | InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" |
24 | CharacterSet="1" | 24 | CharacterSet="1" |
25 | > | 25 | > |
26 | <Tool | 26 | <Tool |
27 | Name="VCPreBuildEventTool" | 27 | Name="VCPreBuildEventTool" |
28 | /> | 28 | /> |
29 | <Tool | 29 | <Tool |
30 | Name="VCCustomBuildTool" | 30 | Name="VCCustomBuildTool" |
31 | /> | 31 | /> |
32 | <Tool | 32 | <Tool |
33 | Name="VCXMLDataGeneratorTool" | 33 | Name="VCXMLDataGeneratorTool" |
34 | /> | 34 | /> |
35 | <Tool | 35 | <Tool |
36 | Name="VCWebServiceProxyGeneratorTool" | 36 | Name="VCWebServiceProxyGeneratorTool" |
37 | /> | 37 | /> |
38 | <Tool | 38 | <Tool |
39 | Name="VCMIDLTool" | 39 | Name="VCMIDLTool" |
40 | /> | 40 | /> |
41 | <Tool | 41 | <Tool |
42 | Name="VCCLCompilerTool" | 42 | Name="VCCLCompilerTool" |
43 | Optimization="0" | 43 | Optimization="0" |
44 | AdditionalIncludeDirectories="..;..\..\llcommon;..\..\llmath;"..\..\..\libraries\i686-win32\include";..\..\..\libraries\include" | 44 | AdditionalIncludeDirectories="..;..\..\llcommon;..\..\llmath;"..\..\..\libraries\i686-win32\include";..\..\..\libraries\include" |
45 | PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG" | 45 | PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG" |
46 | MinimalRebuild="true" | 46 | MinimalRebuild="true" |
47 | BasicRuntimeChecks="3" | 47 | BasicRuntimeChecks="3" |
48 | RuntimeLibrary="1" | 48 | RuntimeLibrary="1" |
49 | StructMemberAlignment="4" | 49 | StructMemberAlignment="4" |
50 | TreatWChar_tAsBuiltInType="false" | 50 | TreatWChar_tAsBuiltInType="false" |
51 | ForceConformanceInForLoopScope="true" | 51 | ForceConformanceInForLoopScope="true" |
52 | UsePrecompiledHeader="0" | 52 | UsePrecompiledHeader="0" |
53 | WarningLevel="3" | 53 | WarningLevel="3" |
54 | WarnAsError="true" | 54 | WarnAsError="true" |
55 | Detect64BitPortabilityProblems="false" | 55 | Detect64BitPortabilityProblems="false" |
56 | DebugInformationFormat="4" | 56 | DebugInformationFormat="4" |
57 | /> | 57 | /> |
58 | <Tool | 58 | <Tool |
59 | Name="VCManagedResourceCompilerTool" | 59 | Name="VCManagedResourceCompilerTool" |
60 | /> | 60 | /> |
61 | <Tool | 61 | <Tool |
62 | Name="VCResourceCompilerTool" | 62 | Name="VCResourceCompilerTool" |
63 | /> | 63 | /> |
64 | <Tool | 64 | <Tool |
65 | Name="VCPreLinkEventTool" | 65 | Name="VCPreLinkEventTool" |
66 | /> | 66 | /> |
67 | <Tool | 67 | <Tool |
68 | Name="VCLibrarianTool" | 68 | Name="VCLibrarianTool" |
69 | OutputFile="$(OutDir)/lscript_execute.lib" | 69 | OutputFile="$(OutDir)/lscript_execute.lib" |
70 | /> | 70 | /> |
71 | <Tool | 71 | <Tool |
72 | Name="VCALinkTool" | 72 | Name="VCALinkTool" |
73 | /> | 73 | /> |
74 | <Tool | 74 | <Tool |
75 | Name="VCXDCMakeTool" | 75 | Name="VCXDCMakeTool" |
76 | /> | 76 | /> |
77 | <Tool | 77 | <Tool |
78 | Name="VCBscMakeTool" | 78 | Name="VCBscMakeTool" |
79 | /> | 79 | /> |
80 | <Tool | 80 | <Tool |
81 | Name="VCFxCopTool" | 81 | Name="VCFxCopTool" |
82 | /> | 82 | /> |
83 | <Tool | 83 | <Tool |
84 | Name="VCPostBuildEventTool" | 84 | Name="VCPostBuildEventTool" |
85 | /> | 85 | /> |
86 | </Configuration> | 86 | </Configuration> |
87 | <Configuration | 87 | <Configuration |
88 | Name="Release|Win32" | 88 | Name="Release|Win32" |
89 | OutputDirectory="../../lib_$(ConfigurationName)/i686-win32" | 89 | OutputDirectory="../../lib_$(ConfigurationName)/i686-win32" |
90 | IntermediateDirectory="Release" | 90 | IntermediateDirectory="Release" |
91 | ConfigurationType="4" | 91 | ConfigurationType="4" |
92 | InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" | 92 | InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" |
93 | CharacterSet="1" | 93 | CharacterSet="1" |
94 | > | 94 | > |
95 | <Tool | 95 | <Tool |
96 | Name="VCPreBuildEventTool" | 96 | Name="VCPreBuildEventTool" |
97 | /> | 97 | /> |
98 | <Tool | 98 | <Tool |
99 | Name="VCCustomBuildTool" | 99 | Name="VCCustomBuildTool" |
100 | /> | 100 | /> |
101 | <Tool | 101 | <Tool |
102 | Name="VCXMLDataGeneratorTool" | 102 | Name="VCXMLDataGeneratorTool" |
103 | /> | 103 | /> |
104 | <Tool | 104 | <Tool |
105 | Name="VCWebServiceProxyGeneratorTool" | 105 | Name="VCWebServiceProxyGeneratorTool" |
106 | /> | 106 | /> |
107 | <Tool | 107 | <Tool |
108 | Name="VCMIDLTool" | 108 | Name="VCMIDLTool" |
109 | /> | 109 | /> |
110 | <Tool | 110 | <Tool |
111 | Name="VCCLCompilerTool" | 111 | Name="VCCLCompilerTool" |
112 | AdditionalOptions="/Oy-" | 112 | AdditionalOptions="/Oy-" |
113 | AdditionalIncludeDirectories="..;..\..\llcommon;..\..\llmath;"..\..\..\libraries\i686-win32\include";..\..\..\libraries\include" | 113 | AdditionalIncludeDirectories="..;..\..\llcommon;..\..\llmath;"..\..\..\libraries\i686-win32\include";..\..\..\libraries\include" |
114 | PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE" | 114 | PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE" |
115 | RuntimeLibrary="0" | 115 | RuntimeLibrary="0" |
116 | StructMemberAlignment="0" | 116 | StructMemberAlignment="0" |
117 | TreatWChar_tAsBuiltInType="false" | 117 | TreatWChar_tAsBuiltInType="false" |
118 | ForceConformanceInForLoopScope="true" | 118 | ForceConformanceInForLoopScope="true" |
119 | UsePrecompiledHeader="0" | 119 | UsePrecompiledHeader="0" |
120 | WarningLevel="3" | 120 | WarningLevel="3" |
121 | WarnAsError="true" | 121 | WarnAsError="true" |
122 | Detect64BitPortabilityProblems="false" | 122 | Detect64BitPortabilityProblems="false" |
123 | DebugInformationFormat="3" | 123 | DebugInformationFormat="3" |
124 | /> | 124 | /> |
125 | <Tool | 125 | <Tool |
126 | Name="VCManagedResourceCompilerTool" | 126 | Name="VCManagedResourceCompilerTool" |
127 | /> | 127 | /> |
128 | <Tool | 128 | <Tool |
129 | Name="VCResourceCompilerTool" | 129 | Name="VCResourceCompilerTool" |
130 | /> | 130 | /> |
131 | <Tool | 131 | <Tool |
132 | Name="VCPreLinkEventTool" | 132 | Name="VCPreLinkEventTool" |
133 | /> | 133 | /> |
134 | <Tool | 134 | <Tool |
135 | Name="VCLibrarianTool" | 135 | Name="VCLibrarianTool" |
136 | OutputFile="$(OutDir)/lscript_execute.lib" | 136 | OutputFile="$(OutDir)/lscript_execute.lib" |
137 | /> | 137 | /> |
138 | <Tool | 138 | <Tool |
139 | Name="VCALinkTool" | 139 | Name="VCALinkTool" |
140 | /> | 140 | /> |
141 | <Tool | 141 | <Tool |
142 | Name="VCXDCMakeTool" | 142 | Name="VCXDCMakeTool" |
143 | /> | 143 | /> |
144 | <Tool | 144 | <Tool |
145 | Name="VCBscMakeTool" | 145 | Name="VCBscMakeTool" |
146 | /> | 146 | /> |
147 | <Tool | 147 | <Tool |
148 | Name="VCFxCopTool" | 148 | Name="VCFxCopTool" |
149 | /> | 149 | /> |
150 | <Tool | 150 | <Tool |
151 | Name="VCPostBuildEventTool" | 151 | Name="VCPostBuildEventTool" |
152 | /> | 152 | /> |
153 | </Configuration> | 153 | </Configuration> |
154 | <Configuration | 154 | <Configuration |
155 | Name="ReleaseNoOpt|Win32" | 155 | Name="ReleaseNoOpt|Win32" |
156 | OutputDirectory="../../lib_$(ConfigurationName)/i686-win32" | 156 | OutputDirectory="../../lib_$(ConfigurationName)/i686-win32" |
157 | IntermediateDirectory="$(ConfigurationName)" | 157 | IntermediateDirectory="$(ConfigurationName)" |
158 | ConfigurationType="4" | 158 | ConfigurationType="4" |
159 | InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" | 159 | InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" |
160 | CharacterSet="1" | 160 | CharacterSet="1" |
161 | > | 161 | > |
162 | <Tool | 162 | <Tool |
163 | Name="VCPreBuildEventTool" | 163 | Name="VCPreBuildEventTool" |
164 | /> | 164 | /> |
165 | <Tool | 165 | <Tool |
166 | Name="VCCustomBuildTool" | 166 | Name="VCCustomBuildTool" |
167 | /> | 167 | /> |
168 | <Tool | 168 | <Tool |
169 | Name="VCXMLDataGeneratorTool" | 169 | Name="VCXMLDataGeneratorTool" |
170 | /> | 170 | /> |
171 | <Tool | 171 | <Tool |
172 | Name="VCWebServiceProxyGeneratorTool" | 172 | Name="VCWebServiceProxyGeneratorTool" |
173 | /> | 173 | /> |
174 | <Tool | 174 | <Tool |
175 | Name="VCMIDLTool" | 175 | Name="VCMIDLTool" |
176 | /> | 176 | /> |
177 | <Tool | 177 | <Tool |
178 | Name="VCCLCompilerTool" | 178 | Name="VCCLCompilerTool" |
179 | AdditionalOptions="/Oy-" | 179 | AdditionalOptions="/Oy-" |
180 | Optimization="0" | 180 | Optimization="0" |
181 | AdditionalIncludeDirectories="..;..\..\llcommon;..\..\llmath;"..\..\..\libraries\i686-win32\include";..\..\..\libraries\include" | 181 | AdditionalIncludeDirectories="..;..\..\llcommon;..\..\llmath;"..\..\..\libraries\i686-win32\include";..\..\..\libraries\include" |
182 | PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE" | 182 | PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE" |
183 | RuntimeLibrary="0" | 183 | RuntimeLibrary="0" |
184 | StructMemberAlignment="0" | 184 | StructMemberAlignment="0" |
185 | TreatWChar_tAsBuiltInType="false" | 185 | TreatWChar_tAsBuiltInType="false" |
186 | ForceConformanceInForLoopScope="true" | 186 | ForceConformanceInForLoopScope="true" |
187 | UsePrecompiledHeader="0" | 187 | UsePrecompiledHeader="0" |
188 | WarningLevel="3" | 188 | WarningLevel="3" |
189 | WarnAsError="true" | 189 | WarnAsError="true" |
190 | Detect64BitPortabilityProblems="false" | 190 | Detect64BitPortabilityProblems="false" |
191 | DebugInformationFormat="3" | 191 | DebugInformationFormat="3" |
192 | /> | 192 | /> |
193 | <Tool | 193 | <Tool |
194 | Name="VCManagedResourceCompilerTool" | 194 | Name="VCManagedResourceCompilerTool" |
195 | /> | 195 | /> |
196 | <Tool | 196 | <Tool |
197 | Name="VCResourceCompilerTool" | 197 | Name="VCResourceCompilerTool" |
198 | /> | 198 | /> |
199 | <Tool | 199 | <Tool |
200 | Name="VCPreLinkEventTool" | 200 | Name="VCPreLinkEventTool" |
201 | /> | 201 | /> |
202 | <Tool | 202 | <Tool |
203 | Name="VCLibrarianTool" | 203 | Name="VCLibrarianTool" |
204 | OutputFile="$(OutDir)/lscript_execute.lib" | 204 | OutputFile="$(OutDir)/lscript_execute.lib" |
205 | /> | 205 | /> |
206 | <Tool | 206 | <Tool |
207 | Name="VCALinkTool" | 207 | Name="VCALinkTool" |
208 | /> | 208 | /> |
209 | <Tool | 209 | <Tool |
210 | Name="VCXDCMakeTool" | 210 | Name="VCXDCMakeTool" |
211 | /> | 211 | /> |
212 | <Tool | 212 | <Tool |
213 | Name="VCBscMakeTool" | 213 | Name="VCBscMakeTool" |
214 | /> | 214 | /> |
215 | <Tool | 215 | <Tool |
216 | Name="VCFxCopTool" | 216 | Name="VCFxCopTool" |
217 | /> | 217 | /> |
218 | <Tool | 218 | <Tool |
219 | Name="VCPostBuildEventTool" | 219 | Name="VCPostBuildEventTool" |
220 | /> | 220 | /> |
221 | </Configuration> | 221 | </Configuration> |
222 | </Configurations> | 222 | </Configurations> |
223 | <References> | 223 | <References> |
224 | </References> | 224 | </References> |
225 | <Files> | 225 | <Files> |
226 | <Filter | 226 | <Filter |
227 | Name="Source Files" | 227 | Name="Source Files" |
228 | Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" | 228 | Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" |
229 | UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" | 229 | UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" |
230 | > | 230 | > |
231 | <File | 231 | <File |
232 | RelativePath=".\lscript_execute.cpp" | 232 | RelativePath=".\lscript_execute.cpp" |
233 | > | 233 | > |
234 | </File> | 234 | </File> |
235 | <File | 235 | <File |
236 | RelativePath=".\lscript_heapruntime.cpp" | 236 | RelativePath=".\lscript_heapruntime.cpp" |
237 | > | 237 | > |
238 | </File> | 238 | </File> |
239 | <File | 239 | <File |
240 | RelativePath=".\lscript_readlso.cpp" | 240 | RelativePath=".\lscript_readlso.cpp" |
241 | > | 241 | > |
242 | </File> | 242 | </File> |
243 | </Filter> | 243 | </Filter> |
244 | <Filter | 244 | <Filter |
245 | Name="Header Files" | 245 | Name="Header Files" |
246 | Filter="h;hpp;hxx;hm;inl;inc;xsd" | 246 | Filter="h;hpp;hxx;hm;inl;inc;xsd" |
247 | UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" | 247 | UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" |
248 | > | 248 | > |
249 | <File | 249 | <File |
250 | RelativePath="..\lscript_byteconvert.h" | 250 | RelativePath="..\lscript_byteconvert.h" |
251 | > | 251 | > |
252 | </File> | 252 | </File> |
253 | <File | 253 | <File |
254 | RelativePath="..\lscript_byteformat.h" | 254 | RelativePath="..\lscript_byteformat.h" |
255 | > | 255 | > |
256 | </File> | 256 | </File> |
257 | <File | 257 | <File |
258 | RelativePath="..\lscript_execute.h" | 258 | RelativePath="..\lscript_execute.h" |
259 | > | 259 | > |
260 | </File> | 260 | </File> |
261 | <File | 261 | <File |
262 | RelativePath=".\lscript_heapruntime.h" | 262 | RelativePath=".\lscript_heapruntime.h" |
263 | > | 263 | > |
264 | </File> | 264 | </File> |
265 | <File | 265 | <File |
266 | RelativePath=".\lscript_readlso.h" | 266 | RelativePath=".\lscript_readlso.h" |
267 | > | 267 | > |
268 | </File> | 268 | </File> |
269 | </Filter> | 269 | </Filter> |
270 | <Filter | 270 | <Filter |
271 | Name="Resource Files" | 271 | Name="Resource Files" |
272 | Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" | 272 | Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" |
273 | UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" | 273 | UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" |
274 | > | 274 | > |
275 | </Filter> | 275 | </Filter> |
276 | </Files> | 276 | </Files> |
277 | <Globals> | 277 | <Globals> |
278 | </Globals> | 278 | </Globals> |
279 | </VisualStudioProject> | 279 | </VisualStudioProject> |
diff --git a/linden/indra/lscript/lscript_execute/lscript_execute_vc9.vcproj b/linden/indra/lscript/lscript_execute/lscript_execute_vc9.vcproj index 9c6f7e3..eb41122 100644 --- a/linden/indra/lscript/lscript_execute/lscript_execute_vc9.vcproj +++ b/linden/indra/lscript/lscript_execute/lscript_execute_vc9.vcproj | |||
@@ -1,280 +1,280 @@ | |||
1 | <?xml version="1.0" encoding="Windows-1252"?> | 1 | <?xml version="1.0" encoding="Windows-1252"?> |
2 | <VisualStudioProject | 2 | <VisualStudioProject |
3 | ProjectType="Visual C++" | 3 | ProjectType="Visual C++" |
4 | Version="9.00" | 4 | Version="9.00" |
5 | Name="lscript_execute" | 5 | Name="lscript_execute" |
6 | ProjectGUID="{F882263E-4F2A-43D9-A45A-FA4C8EC66552}" | 6 | ProjectGUID="{F882263E-4F2A-43D9-A45A-FA4C8EC66552}" |
7 | RootNamespace="lscript_execute" | 7 | RootNamespace="lscript_execute" |
8 | Keyword="Win32Proj" | 8 | Keyword="Win32Proj" |
9 | TargetFrameworkVersion="131072" | 9 | TargetFrameworkVersion="131072" |
10 | > | 10 | > |
11 | <Platforms> | 11 | <Platforms> |
12 | <Platform | 12 | <Platform |
13 | Name="Win32" | 13 | Name="Win32" |
14 | /> | 14 | /> |
15 | </Platforms> | 15 | </Platforms> |
16 | <ToolFiles> | 16 | <ToolFiles> |
17 | </ToolFiles> | 17 | </ToolFiles> |
18 | <Configurations> | 18 | <Configurations> |
19 | <Configuration | 19 | <Configuration |
20 | Name="Debug|Win32" | 20 | Name="Debug|Win32" |
21 | OutputDirectory="../../lib_$(ConfigurationName)/i686-win32" | 21 | OutputDirectory="../../lib_$(ConfigurationName)/i686-win32" |
22 | IntermediateDirectory="Debug" | 22 | IntermediateDirectory="Debug" |
23 | ConfigurationType="4" | 23 | ConfigurationType="4" |
24 | InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" | 24 | InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" |
25 | CharacterSet="1" | 25 | CharacterSet="1" |
26 | > | 26 | > |
27 | <Tool | 27 | <Tool |
28 | Name="VCPreBuildEventTool" | 28 | Name="VCPreBuildEventTool" |
29 | /> | 29 | /> |
30 | <Tool | 30 | <Tool |
31 | Name="VCCustomBuildTool" | 31 | Name="VCCustomBuildTool" |
32 | /> | 32 | /> |
33 | <Tool | 33 | <Tool |
34 | Name="VCXMLDataGeneratorTool" | 34 | Name="VCXMLDataGeneratorTool" |
35 | /> | 35 | /> |
36 | <Tool | 36 | <Tool |
37 | Name="VCWebServiceProxyGeneratorTool" | 37 | Name="VCWebServiceProxyGeneratorTool" |
38 | /> | 38 | /> |
39 | <Tool | 39 | <Tool |
40 | Name="VCMIDLTool" | 40 | Name="VCMIDLTool" |
41 | /> | 41 | /> |
42 | <Tool | 42 | <Tool |
43 | Name="VCCLCompilerTool" | 43 | Name="VCCLCompilerTool" |
44 | Optimization="0" | 44 | Optimization="0" |
45 | AdditionalIncludeDirectories="..;..\..\llcommon;..\..\llmath;"..\..\..\libraries\i686-win32\include";..\..\..\libraries\include" | 45 | AdditionalIncludeDirectories="..;..\..\llcommon;..\..\llmath;"..\..\..\libraries\i686-win32\include";..\..\..\libraries\include" |
46 | PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG" | 46 | PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG" |
47 | MinimalRebuild="true" | 47 | MinimalRebuild="true" |
48 | BasicRuntimeChecks="3" | 48 | BasicRuntimeChecks="3" |
49 | RuntimeLibrary="1" | 49 | RuntimeLibrary="1" |
50 | StructMemberAlignment="4" | 50 | StructMemberAlignment="4" |
51 | TreatWChar_tAsBuiltInType="false" | 51 | TreatWChar_tAsBuiltInType="false" |
52 | ForceConformanceInForLoopScope="true" | 52 | ForceConformanceInForLoopScope="true" |
53 | UsePrecompiledHeader="0" | 53 | UsePrecompiledHeader="0" |
54 | WarningLevel="3" | 54 | WarningLevel="3" |
55 | WarnAsError="true" | 55 | WarnAsError="true" |
56 | Detect64BitPortabilityProblems="false" | 56 | Detect64BitPortabilityProblems="false" |
57 | DebugInformationFormat="4" | 57 | DebugInformationFormat="4" |
58 | /> | 58 | /> |
59 | <Tool | 59 | <Tool |
60 | Name="VCManagedResourceCompilerTool" | 60 | Name="VCManagedResourceCompilerTool" |
61 | /> | 61 | /> |
62 | <Tool | 62 | <Tool |
63 | Name="VCResourceCompilerTool" | 63 | Name="VCResourceCompilerTool" |
64 | /> | 64 | /> |
65 | <Tool | 65 | <Tool |
66 | Name="VCPreLinkEventTool" | 66 | Name="VCPreLinkEventTool" |
67 | /> | 67 | /> |
68 | <Tool | 68 | <Tool |
69 | Name="VCLibrarianTool" | 69 | Name="VCLibrarianTool" |
70 | OutputFile="$(OutDir)/lscript_execute.lib" | 70 | OutputFile="$(OutDir)/lscript_execute.lib" |
71 | /> | 71 | /> |
72 | <Tool | 72 | <Tool |
73 | Name="VCALinkTool" | 73 | Name="VCALinkTool" |
74 | /> | 74 | /> |
75 | <Tool | 75 | <Tool |
76 | Name="VCXDCMakeTool" | 76 | Name="VCXDCMakeTool" |
77 | /> | 77 | /> |
78 | <Tool | 78 | <Tool |
79 | Name="VCBscMakeTool" | 79 | Name="VCBscMakeTool" |
80 | /> | 80 | /> |
81 | <Tool | 81 | <Tool |
82 | Name="VCFxCopTool" | 82 | Name="VCFxCopTool" |
83 | /> | 83 | /> |
84 | <Tool | 84 | <Tool |
85 | Name="VCPostBuildEventTool" | 85 | Name="VCPostBuildEventTool" |
86 | /> | 86 | /> |
87 | </Configuration> | 87 | </Configuration> |
88 | <Configuration | 88 | <Configuration |
89 | Name="Release|Win32" | 89 | Name="Release|Win32" |
90 | OutputDirectory="../../lib_$(ConfigurationName)/i686-win32" | 90 | OutputDirectory="../../lib_$(ConfigurationName)/i686-win32" |
91 | IntermediateDirectory="Release" | 91 | IntermediateDirectory="Release" |
92 | ConfigurationType="4" | 92 | ConfigurationType="4" |
93 | InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" | 93 | InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" |
94 | CharacterSet="1" | 94 | CharacterSet="1" |
95 | > | 95 | > |
96 | <Tool | 96 | <Tool |
97 | Name="VCPreBuildEventTool" | 97 | Name="VCPreBuildEventTool" |
98 | /> | 98 | /> |
99 | <Tool | 99 | <Tool |
100 | Name="VCCustomBuildTool" | 100 | Name="VCCustomBuildTool" |
101 | /> | 101 | /> |
102 | <Tool | 102 | <Tool |
103 | Name="VCXMLDataGeneratorTool" | 103 | Name="VCXMLDataGeneratorTool" |
104 | /> | 104 | /> |
105 | <Tool | 105 | <Tool |
106 | Name="VCWebServiceProxyGeneratorTool" | 106 | Name="VCWebServiceProxyGeneratorTool" |
107 | /> | 107 | /> |
108 | <Tool | 108 | <Tool |
109 | Name="VCMIDLTool" | 109 | Name="VCMIDLTool" |
110 | /> | 110 | /> |
111 | <Tool | 111 | <Tool |
112 | Name="VCCLCompilerTool" | 112 | Name="VCCLCompilerTool" |
113 | AdditionalOptions="/Oy-" | 113 | AdditionalOptions="/Oy-" |
114 | AdditionalIncludeDirectories="..;..\..\llcommon;..\..\llmath;"..\..\..\libraries\i686-win32\include";..\..\..\libraries\include" | 114 | AdditionalIncludeDirectories="..;..\..\llcommon;..\..\llmath;"..\..\..\libraries\i686-win32\include";..\..\..\libraries\include" |
115 | PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE" | 115 | PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE" |
116 | RuntimeLibrary="0" | 116 | RuntimeLibrary="0" |
117 | StructMemberAlignment="0" | 117 | StructMemberAlignment="0" |
118 | TreatWChar_tAsBuiltInType="false" | 118 | TreatWChar_tAsBuiltInType="false" |
119 | ForceConformanceInForLoopScope="true" | 119 | ForceConformanceInForLoopScope="true" |
120 | UsePrecompiledHeader="0" | 120 | UsePrecompiledHeader="0" |
121 | WarningLevel="3" | 121 | WarningLevel="3" |
122 | WarnAsError="true" | 122 | WarnAsError="true" |
123 | Detect64BitPortabilityProblems="false" | 123 | Detect64BitPortabilityProblems="false" |
124 | DebugInformationFormat="3" | 124 | DebugInformationFormat="3" |
125 | /> | 125 | /> |
126 | <Tool | 126 | <Tool |
127 | Name="VCManagedResourceCompilerTool" | 127 | Name="VCManagedResourceCompilerTool" |
128 | /> | 128 | /> |
129 | <Tool | 129 | <Tool |
130 | Name="VCResourceCompilerTool" | 130 | Name="VCResourceCompilerTool" |
131 | /> | 131 | /> |
132 | <Tool | 132 | <Tool |
133 | Name="VCPreLinkEventTool" | 133 | Name="VCPreLinkEventTool" |
134 | /> | 134 | /> |
135 | <Tool | 135 | <Tool |
136 | Name="VCLibrarianTool" | 136 | Name="VCLibrarianTool" |
137 | OutputFile="$(OutDir)/lscript_execute.lib" | 137 | OutputFile="$(OutDir)/lscript_execute.lib" |
138 | /> | 138 | /> |
139 | <Tool | 139 | <Tool |
140 | Name="VCALinkTool" | 140 | Name="VCALinkTool" |
141 | /> | 141 | /> |
142 | <Tool | 142 | <Tool |
143 | Name="VCXDCMakeTool" | 143 | Name="VCXDCMakeTool" |
144 | /> | 144 | /> |
145 | <Tool | 145 | <Tool |
146 | Name="VCBscMakeTool" | 146 | Name="VCBscMakeTool" |
147 | /> | 147 | /> |
148 | <Tool | 148 | <Tool |
149 | Name="VCFxCopTool" | 149 | Name="VCFxCopTool" |
150 | /> | 150 | /> |
151 | <Tool | 151 | <Tool |
152 | Name="VCPostBuildEventTool" | 152 | Name="VCPostBuildEventTool" |
153 | /> | 153 | /> |
154 | </Configuration> | 154 | </Configuration> |
155 | <Configuration | 155 | <Configuration |
156 | Name="ReleaseNoOpt|Win32" | 156 | Name="ReleaseNoOpt|Win32" |
157 | OutputDirectory="../../lib_$(ConfigurationName)/i686-win32" | 157 | OutputDirectory="../../lib_$(ConfigurationName)/i686-win32" |
158 | IntermediateDirectory="$(ConfigurationName)" | 158 | IntermediateDirectory="$(ConfigurationName)" |
159 | ConfigurationType="4" | 159 | ConfigurationType="4" |
160 | InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" | 160 | InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" |
161 | CharacterSet="1" | 161 | CharacterSet="1" |
162 | > | 162 | > |
163 | <Tool | 163 | <Tool |
164 | Name="VCPreBuildEventTool" | 164 | Name="VCPreBuildEventTool" |
165 | /> | 165 | /> |
166 | <Tool | 166 | <Tool |
167 | Name="VCCustomBuildTool" | 167 | Name="VCCustomBuildTool" |
168 | /> | 168 | /> |
169 | <Tool | 169 | <Tool |
170 | Name="VCXMLDataGeneratorTool" | 170 | Name="VCXMLDataGeneratorTool" |
171 | /> | 171 | /> |
172 | <Tool | 172 | <Tool |
173 | Name="VCWebServiceProxyGeneratorTool" | 173 | Name="VCWebServiceProxyGeneratorTool" |
174 | /> | 174 | /> |
175 | <Tool | 175 | <Tool |
176 | Name="VCMIDLTool" | 176 | Name="VCMIDLTool" |
177 | /> | 177 | /> |
178 | <Tool | 178 | <Tool |
179 | Name="VCCLCompilerTool" | 179 | Name="VCCLCompilerTool" |
180 | AdditionalOptions="/Oy-" | 180 | AdditionalOptions="/Oy-" |
181 | Optimization="0" | 181 | Optimization="0" |
182 | AdditionalIncludeDirectories="..;..\..\llcommon;..\..\llmath;"..\..\..\libraries\i686-win32\include";..\..\..\libraries\include" | 182 | AdditionalIncludeDirectories="..;..\..\llcommon;..\..\llmath;"..\..\..\libraries\i686-win32\include";..\..\..\libraries\include" |
183 | PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE" | 183 | PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE" |
184 | RuntimeLibrary="0" | 184 | RuntimeLibrary="0" |
185 | StructMemberAlignment="0" | 185 | StructMemberAlignment="0" |
186 | TreatWChar_tAsBuiltInType="false" | 186 | TreatWChar_tAsBuiltInType="false" |
187 | ForceConformanceInForLoopScope="true" | 187 | ForceConformanceInForLoopScope="true" |
188 | UsePrecompiledHeader="0" | 188 | UsePrecompiledHeader="0" |
189 | WarningLevel="3" | 189 | WarningLevel="3" |
190 | WarnAsError="true" | 190 | WarnAsError="true" |
191 | Detect64BitPortabilityProblems="false" | 191 | Detect64BitPortabilityProblems="false" |
192 | DebugInformationFormat="3" | 192 | DebugInformationFormat="3" |
193 | /> | 193 | /> |
194 | <Tool | 194 | <Tool |
195 | Name="VCManagedResourceCompilerTool" | 195 | Name="VCManagedResourceCompilerTool" |
196 | /> | 196 | /> |
197 | <Tool | 197 | <Tool |
198 | Name="VCResourceCompilerTool" | 198 | Name="VCResourceCompilerTool" |
199 | /> | 199 | /> |
200 | <Tool | 200 | <Tool |
201 | Name="VCPreLinkEventTool" | 201 | Name="VCPreLinkEventTool" |
202 | /> | 202 | /> |
203 | <Tool | 203 | <Tool |
204 | Name="VCLibrarianTool" | 204 | Name="VCLibrarianTool" |
205 | OutputFile="$(OutDir)/lscript_execute.lib" | 205 | OutputFile="$(OutDir)/lscript_execute.lib" |
206 | /> | 206 | /> |
207 | <Tool | 207 | <Tool |
208 | Name="VCALinkTool" | 208 | Name="VCALinkTool" |
209 | /> | 209 | /> |
210 | <Tool | 210 | <Tool |
211 | Name="VCXDCMakeTool" | 211 | Name="VCXDCMakeTool" |
212 | /> | 212 | /> |
213 | <Tool | 213 | <Tool |
214 | Name="VCBscMakeTool" | 214 | Name="VCBscMakeTool" |
215 | /> | 215 | /> |
216 | <Tool | 216 | <Tool |
217 | Name="VCFxCopTool" | 217 | Name="VCFxCopTool" |
218 | /> | 218 | /> |
219 | <Tool | 219 | <Tool |
220 | Name="VCPostBuildEventTool" | 220 | Name="VCPostBuildEventTool" |
221 | /> | 221 | /> |
222 | </Configuration> | 222 | </Configuration> |
223 | </Configurations> | 223 | </Configurations> |
224 | <References> | 224 | <References> |
225 | </References> | 225 | </References> |
226 | <Files> | 226 | <Files> |
227 | <Filter | 227 | <Filter |
228 | Name="Source Files" | 228 | Name="Source Files" |
229 | Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" | 229 | Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" |
230 | UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" | 230 | UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" |
231 | > | 231 | > |
232 | <File | 232 | <File |
233 | RelativePath=".\lscript_execute.cpp" | 233 | RelativePath=".\lscript_execute.cpp" |
234 | > | 234 | > |
235 | </File> | 235 | </File> |
236 | <File | 236 | <File |
237 | RelativePath=".\lscript_heapruntime.cpp" | 237 | RelativePath=".\lscript_heapruntime.cpp" |
238 | > | 238 | > |
239 | </File> | 239 | </File> |
240 | <File | 240 | <File |
241 | RelativePath=".\lscript_readlso.cpp" | 241 | RelativePath=".\lscript_readlso.cpp" |
242 | > | 242 | > |
243 | </File> | 243 | </File> |
244 | </Filter> | 244 | </Filter> |
245 | <Filter | 245 | <Filter |
246 | Name="Header Files" | 246 | Name="Header Files" |
247 | Filter="h;hpp;hxx;hm;inl;inc;xsd" | 247 | Filter="h;hpp;hxx;hm;inl;inc;xsd" |
248 | UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" | 248 | UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" |
249 | > | 249 | > |
250 | <File | 250 | <File |
251 | RelativePath="..\lscript_byteconvert.h" | 251 | RelativePath="..\lscript_byteconvert.h" |
252 | > | 252 | > |
253 | </File> | 253 | </File> |
254 | <File | 254 | <File |
255 | RelativePath="..\lscript_byteformat.h" | 255 | RelativePath="..\lscript_byteformat.h" |
256 | > | 256 | > |
257 | </File> | 257 | </File> |
258 | <File | 258 | <File |
259 | RelativePath="..\lscript_execute.h" | 259 | RelativePath="..\lscript_execute.h" |
260 | > | 260 | > |
261 | </File> | 261 | </File> |
262 | <File | 262 | <File |
263 | RelativePath=".\lscript_heapruntime.h" | 263 | RelativePath=".\lscript_heapruntime.h" |
264 | > | 264 | > |
265 | </File> | 265 | </File> |
266 | <File | 266 | <File |
267 | RelativePath=".\lscript_readlso.h" | 267 | RelativePath=".\lscript_readlso.h" |
268 | > | 268 | > |
269 | </File> | 269 | </File> |
270 | </Filter> | 270 | </Filter> |
271 | <Filter | 271 | <Filter |
272 | Name="Resource Files" | 272 | Name="Resource Files" |
273 | Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" | 273 | Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" |
274 | UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" | 274 | UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" |
275 | > | 275 | > |
276 | </Filter> | 276 | </Filter> |
277 | </Files> | 277 | </Files> |
278 | <Globals> | 278 | <Globals> |
279 | </Globals> | 279 | </Globals> |
280 | </VisualStudioProject> | 280 | </VisualStudioProject> |
diff --git a/linden/indra/lscript/lscript_execute/lscript_readlso.cpp b/linden/indra/lscript/lscript_execute/lscript_readlso.cpp index b6d5092..218e14a 100644 --- a/linden/indra/lscript/lscript_execute/lscript_readlso.cpp +++ b/linden/indra/lscript/lscript_execute/lscript_readlso.cpp | |||
@@ -155,7 +155,7 @@ void LLScriptLSOParse::printGlobals(FILE *fp) | |||
155 | type = *(mRawData + global_v_offset++); | 155 | type = *(mRawData + global_v_offset++); |
156 | 156 | ||
157 | // set name | 157 | // set name |
158 | bytestream2char(name, mRawData, global_v_offset); | 158 | bytestream2char(name, mRawData, global_v_offset, sizeof(name)); |
159 | 159 | ||
160 | switch(type) | 160 | switch(type) |
161 | { | 161 | { |
@@ -261,7 +261,7 @@ void LLScriptLSOParse::printGlobalFunctions(FILE *fp) | |||
261 | // where do the opcodes start | 261 | // where do the opcodes start |
262 | opcode_start = bytestream2integer(mRawData, function_offset); | 262 | opcode_start = bytestream2integer(mRawData, function_offset); |
263 | opcode_start += orig_function_offset; | 263 | opcode_start += orig_function_offset; |
264 | bytestream2char(name, mRawData, function_offset); | 264 | bytestream2char(name, mRawData, function_offset, sizeof(name)); |
265 | // get return type | 265 | // get return type |
266 | type = *(mRawData + function_offset++); | 266 | type = *(mRawData + function_offset++); |
267 | fprintf(fp, "[Function #%d] [0x%X] %s\n", function_number, orig_function_offset, name); | 267 | fprintf(fp, "[Function #%d] [0x%X] %s\n", function_number, orig_function_offset, name); |
@@ -272,7 +272,7 @@ void LLScriptLSOParse::printGlobalFunctions(FILE *fp) | |||
272 | S32 pcount = 0; | 272 | S32 pcount = 0; |
273 | while (type) | 273 | while (type) |
274 | { | 274 | { |
275 | bytestream2char(name, mRawData, function_offset); | 275 | bytestream2char(name, mRawData, function_offset, sizeof(name)); |
276 | fprintf(fp, "\tParameter #%d: %s %s\n", pcount++, LSCRIPTTypeNames[type], name); | 276 | fprintf(fp, "\tParameter #%d: %s %s\n", pcount++, LSCRIPTTypeNames[type], name); |
277 | type = *(mRawData + function_offset++); | 277 | type = *(mRawData + function_offset++); |
278 | } | 278 | } |
@@ -336,7 +336,7 @@ void LLScriptLSOParse::printStates(FILE *fp) | |||
336 | state_info_offset += state_offset; | 336 | state_info_offset += state_offset; |
337 | fprintf(fp, "[0x%X] ", state_info_offset); | 337 | fprintf(fp, "[0x%X] ", state_info_offset); |
338 | state_info_offset += LSCRIPTDataSize[LST_INTEGER]; | 338 | state_info_offset += LSCRIPTDataSize[LST_INTEGER]; |
339 | bytestream2char(name, mRawData, state_info_offset); | 339 | bytestream2char(name, mRawData, state_info_offset, sizeof(name)); |
340 | fprintf(fp, "%s\n", name); | 340 | fprintf(fp, "%s\n", name); |
341 | 341 | ||
342 | event_jump_table = state_info_offset; | 342 | event_jump_table = state_info_offset; |
@@ -385,243 +385,243 @@ void LLScriptLSOParse::printStates(FILE *fp) | |||
385 | switch(j) | 385 | switch(j) |
386 | { | 386 | { |
387 | case LSTT_STATE_ENTRY: // LSTT_STATE_ENTRY | 387 | case LSTT_STATE_ENTRY: // LSTT_STATE_ENTRY |
388 | bytestream2char(name, mRawData, event_offset); | 388 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
389 | fprintf(fp, "%s\n", name); | 389 | fprintf(fp, "%s\n", name); |
390 | break; | 390 | break; |
391 | case LSTT_STATE_EXIT: // LSTT_STATE_EXIT | 391 | case LSTT_STATE_EXIT: // LSTT_STATE_EXIT |
392 | bytestream2char(name, mRawData, event_offset); | 392 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
393 | fprintf(fp, "%s\n", name); | 393 | fprintf(fp, "%s\n", name); |
394 | break; | 394 | break; |
395 | case LSTT_TOUCH_START: // LSTT_TOUCH_START | 395 | case LSTT_TOUCH_START: // LSTT_TOUCH_START |
396 | bytestream2char(name, mRawData, event_offset); | 396 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
397 | fprintf(fp, "%s\n", name); | 397 | fprintf(fp, "%s\n", name); |
398 | bytestream2char(name, mRawData, event_offset); | 398 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
399 | fprintf(fp, "\t\tkey %s\n", name); | 399 | fprintf(fp, "\t\tkey %s\n", name); |
400 | bytestream2char(name, mRawData, event_offset); | 400 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
401 | fprintf(fp, "\t\tvector %s\n", name); | 401 | fprintf(fp, "\t\tvector %s\n", name); |
402 | break; | 402 | break; |
403 | case LSTT_TOUCH: // LSTT_TOUCH | 403 | case LSTT_TOUCH: // LSTT_TOUCH |
404 | bytestream2char(name, mRawData, event_offset); | 404 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
405 | fprintf(fp, "%s\n", name); | 405 | fprintf(fp, "%s\n", name); |
406 | bytestream2char(name, mRawData, event_offset); | 406 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
407 | fprintf(fp, "\t\tkey %s\n", name); | 407 | fprintf(fp, "\t\tkey %s\n", name); |
408 | bytestream2char(name, mRawData, event_offset); | 408 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
409 | fprintf(fp, "\t\tvector %s\n", name); | 409 | fprintf(fp, "\t\tvector %s\n", name); |
410 | break; | 410 | break; |
411 | case LSTT_TOUCH_END: // LSTT_TOUCH_END | 411 | case LSTT_TOUCH_END: // LSTT_TOUCH_END |
412 | bytestream2char(name, mRawData, event_offset); | 412 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
413 | fprintf(fp, "%s\n", name); | 413 | fprintf(fp, "%s\n", name); |
414 | bytestream2char(name, mRawData, event_offset); | 414 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
415 | fprintf(fp, "\t\tkey %s\n", name); | 415 | fprintf(fp, "\t\tkey %s\n", name); |
416 | bytestream2char(name, mRawData, event_offset); | 416 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
417 | fprintf(fp, "\t\tvector %s\n", name); | 417 | fprintf(fp, "\t\tvector %s\n", name); |
418 | break; | 418 | break; |
419 | case LSTT_COLLISION_START: // LSTT_COLLISION_START | 419 | case LSTT_COLLISION_START: // LSTT_COLLISION_START |
420 | bytestream2char(name, mRawData, event_offset); | 420 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
421 | fprintf(fp, "%s\n", name); | 421 | fprintf(fp, "%s\n", name); |
422 | bytestream2char(name, mRawData, event_offset); | 422 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
423 | fprintf(fp, "\t\tkey %s\n", name); | 423 | fprintf(fp, "\t\tkey %s\n", name); |
424 | bytestream2char(name, mRawData, event_offset); | 424 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
425 | fprintf(fp, "\t\tvector %s\n", name); | 425 | fprintf(fp, "\t\tvector %s\n", name); |
426 | bytestream2char(name, mRawData, event_offset); | 426 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
427 | fprintf(fp, "\t\tvector %s\n", name); | 427 | fprintf(fp, "\t\tvector %s\n", name); |
428 | break; | 428 | break; |
429 | case LSTT_COLLISION: // LSTT_COLLISION | 429 | case LSTT_COLLISION: // LSTT_COLLISION |
430 | bytestream2char(name, mRawData, event_offset); | 430 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
431 | fprintf(fp, "%s\n", name); | 431 | fprintf(fp, "%s\n", name); |
432 | bytestream2char(name, mRawData, event_offset); | 432 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
433 | fprintf(fp, "\t\tkey %s\n", name); | 433 | fprintf(fp, "\t\tkey %s\n", name); |
434 | bytestream2char(name, mRawData, event_offset); | 434 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
435 | fprintf(fp, "\t\tvector %s\n", name); | 435 | fprintf(fp, "\t\tvector %s\n", name); |
436 | bytestream2char(name, mRawData, event_offset); | 436 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
437 | fprintf(fp, "\t\tvector %s\n", name); | 437 | fprintf(fp, "\t\tvector %s\n", name); |
438 | break; | 438 | break; |
439 | case LSTT_COLLISION_END: // LSTT_COLLISION_END | 439 | case LSTT_COLLISION_END: // LSTT_COLLISION_END |
440 | bytestream2char(name, mRawData, event_offset); | 440 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
441 | fprintf(fp, "%s\n", name); | 441 | fprintf(fp, "%s\n", name); |
442 | bytestream2char(name, mRawData, event_offset); | 442 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
443 | fprintf(fp, "\t\tkey %s\n", name); | 443 | fprintf(fp, "\t\tkey %s\n", name); |
444 | bytestream2char(name, mRawData, event_offset); | 444 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
445 | fprintf(fp, "\t\tvector %s\n", name); | 445 | fprintf(fp, "\t\tvector %s\n", name); |
446 | bytestream2char(name, mRawData, event_offset); | 446 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
447 | fprintf(fp, "\t\tvector %s\n", name); | 447 | fprintf(fp, "\t\tvector %s\n", name); |
448 | break; | 448 | break; |
449 | case LSTT_LAND_COLLISION_START: // LSTT_LAND_COLLISION_START | 449 | case LSTT_LAND_COLLISION_START: // LSTT_LAND_COLLISION_START |
450 | bytestream2char(name, mRawData, event_offset); | 450 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
451 | fprintf(fp, "%s\n", name); | 451 | fprintf(fp, "%s\n", name); |
452 | bytestream2char(name, mRawData, event_offset); | 452 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
453 | fprintf(fp, "\t\tvector %s\n", name); | 453 | fprintf(fp, "\t\tvector %s\n", name); |
454 | break; | 454 | break; |
455 | case LSTT_LAND_COLLISION: // LSTT_LAND_COLLISION | 455 | case LSTT_LAND_COLLISION: // LSTT_LAND_COLLISION |
456 | bytestream2char(name, mRawData, event_offset); | 456 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
457 | fprintf(fp, "%s\n", name); | 457 | fprintf(fp, "%s\n", name); |
458 | bytestream2char(name, mRawData, event_offset); | 458 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
459 | fprintf(fp, "\t\tvector %s\n", name); | 459 | fprintf(fp, "\t\tvector %s\n", name); |
460 | break; | 460 | break; |
461 | case LSTT_LAND_COLLISION_END: // LSTT_LAND_COLLISION_END | 461 | case LSTT_LAND_COLLISION_END: // LSTT_LAND_COLLISION_END |
462 | bytestream2char(name, mRawData, event_offset); | 462 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
463 | fprintf(fp, "%s\n", name); | 463 | fprintf(fp, "%s\n", name); |
464 | bytestream2char(name, mRawData, event_offset); | 464 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
465 | fprintf(fp, "\t\tvector %s\n", name); | 465 | fprintf(fp, "\t\tvector %s\n", name); |
466 | break; | 466 | break; |
467 | case LSTT_INVENTORY: // LSTT_INVENTORY | 467 | case LSTT_INVENTORY: // LSTT_INVENTORY |
468 | bytestream2char(name, mRawData, event_offset); | 468 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
469 | fprintf(fp, "%s\n", name); | 469 | fprintf(fp, "%s\n", name); |
470 | bytestream2char(name, mRawData, event_offset); | 470 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
471 | fprintf(fp, "\t\tinteger %s\n", name); | 471 | fprintf(fp, "\t\tinteger %s\n", name); |
472 | break; | 472 | break; |
473 | case LSTT_ATTACH: // LSTT_ATTACH | 473 | case LSTT_ATTACH: // LSTT_ATTACH |
474 | bytestream2char(name, mRawData, event_offset); | 474 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
475 | fprintf(fp, "%s\n", name); | 475 | fprintf(fp, "%s\n", name); |
476 | bytestream2char(name, mRawData, event_offset); | 476 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
477 | fprintf(fp, "\t\tkey %s\n", name); | 477 | fprintf(fp, "\t\tkey %s\n", name); |
478 | break; | 478 | break; |
479 | case LSTT_DATASERVER: // LSTT_DATASERVER | 479 | case LSTT_DATASERVER: // LSTT_DATASERVER |
480 | bytestream2char(name, mRawData, event_offset); | 480 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
481 | fprintf(fp, "%s\n", name); | 481 | fprintf(fp, "%s\n", name); |
482 | bytestream2char(name, mRawData, event_offset); | 482 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
483 | fprintf(fp, "\t\tkey %s\n", name); | 483 | fprintf(fp, "\t\tkey %s\n", name); |
484 | bytestream2char(name, mRawData, event_offset); | 484 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
485 | fprintf(fp, "\t\tstring %s\n", name); | 485 | fprintf(fp, "\t\tstring %s\n", name); |
486 | break; | 486 | break; |
487 | case LSTT_TIMER: // LSTT_TIMER | 487 | case LSTT_TIMER: // LSTT_TIMER |
488 | bytestream2char(name, mRawData, event_offset); | 488 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
489 | fprintf(fp, "%s\n", name); | 489 | fprintf(fp, "%s\n", name); |
490 | break; | 490 | break; |
491 | case LSTT_MOVING_START: // LSTT_MOVING_START | 491 | case LSTT_MOVING_START: // LSTT_MOVING_START |
492 | bytestream2char(name, mRawData, event_offset); | 492 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
493 | fprintf(fp, "%s\n", name); | 493 | fprintf(fp, "%s\n", name); |
494 | break; | 494 | break; |
495 | case LSTT_MOVING_END: // LSTT_MOVING_END | 495 | case LSTT_MOVING_END: // LSTT_MOVING_END |
496 | bytestream2char(name, mRawData, event_offset); | 496 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
497 | fprintf(fp, "%s\n", name); | 497 | fprintf(fp, "%s\n", name); |
498 | break; | 498 | break; |
499 | case LSTT_CHAT: // LSTT_CHAT | 499 | case LSTT_CHAT: // LSTT_CHAT |
500 | bytestream2char(name, mRawData, event_offset); | 500 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
501 | fprintf(fp, "%s\n", name); | 501 | fprintf(fp, "%s\n", name); |
502 | bytestream2char(name, mRawData, event_offset); | 502 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
503 | fprintf(fp, "\t\tinteger %s\n", name); | 503 | fprintf(fp, "\t\tinteger %s\n", name); |
504 | bytestream2char(name, mRawData, event_offset); | 504 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
505 | fprintf(fp, "\t\tkey %s\n", name); | 505 | fprintf(fp, "\t\tkey %s\n", name); |
506 | bytestream2char(name, mRawData, event_offset); | 506 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
507 | fprintf(fp, "\t\tstring %s\n", name); | 507 | fprintf(fp, "\t\tstring %s\n", name); |
508 | break; | 508 | break; |
509 | case LSTT_OBJECT_REZ: // LSTT_OBJECT_REZ | 509 | case LSTT_OBJECT_REZ: // LSTT_OBJECT_REZ |
510 | bytestream2char(name, mRawData, event_offset); | 510 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
511 | fprintf(fp, "%s\n", name); | 511 | fprintf(fp, "%s\n", name); |
512 | bytestream2char(name, mRawData, event_offset); | 512 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
513 | fprintf(fp, "\t\tkey %s\n", name); | 513 | fprintf(fp, "\t\tkey %s\n", name); |
514 | break; | 514 | break; |
515 | case LSTT_REMOTE_DATA: // LSTT_REMOTE_DATA | 515 | case LSTT_REMOTE_DATA: // LSTT_REMOTE_DATA |
516 | bytestream2char(name, mRawData, event_offset); | 516 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
517 | fprintf(fp, "%s\n", name); | 517 | fprintf(fp, "%s\n", name); |
518 | bytestream2char(name, mRawData, event_offset); | 518 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
519 | fprintf(fp, "\t\tinteger %s\n", name); | 519 | fprintf(fp, "\t\tinteger %s\n", name); |
520 | bytestream2char(name, mRawData, event_offset); | 520 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
521 | fprintf(fp, "\t\tkey %s\n", name); | 521 | fprintf(fp, "\t\tkey %s\n", name); |
522 | bytestream2char(name, mRawData, event_offset); | 522 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
523 | fprintf(fp, "\t\tinteger %s\n", name); | 523 | fprintf(fp, "\t\tinteger %s\n", name); |
524 | bytestream2char(name, mRawData, event_offset); | 524 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
525 | fprintf(fp, "\t\tstring %s\n", name); | 525 | fprintf(fp, "\t\tstring %s\n", name); |
526 | break; | 526 | break; |
527 | case LSTT_REZ: // LSTT_REZ | 527 | case LSTT_REZ: // LSTT_REZ |
528 | bytestream2char(name, mRawData, event_offset); | 528 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
529 | fprintf(fp, "%s\n", name); | 529 | fprintf(fp, "%s\n", name); |
530 | break; | 530 | break; |
531 | case LSTT_SENSOR: // LSTT_SENSOR | 531 | case LSTT_SENSOR: // LSTT_SENSOR |
532 | bytestream2char(name, mRawData, event_offset); | 532 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
533 | fprintf(fp, "%s\n", name); | 533 | fprintf(fp, "%s\n", name); |
534 | bytestream2char(name, mRawData, event_offset); | 534 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
535 | fprintf(fp, "\t\tinteger %s\n", name); | 535 | fprintf(fp, "\t\tinteger %s\n", name); |
536 | break; | 536 | break; |
537 | case LSTT_NO_SENSOR: // LSTT_NO_SENSOR | 537 | case LSTT_NO_SENSOR: // LSTT_NO_SENSOR |
538 | bytestream2char(name, mRawData, event_offset); | 538 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
539 | fprintf(fp, "%s\n", name); | 539 | fprintf(fp, "%s\n", name); |
540 | break; | 540 | break; |
541 | case LSTT_CONTROL: // LSTT_CONTROL | 541 | case LSTT_CONTROL: // LSTT_CONTROL |
542 | bytestream2char(name, mRawData, event_offset); | 542 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
543 | fprintf(fp, "%s\n", name); | 543 | fprintf(fp, "%s\n", name); |
544 | bytestream2char(name, mRawData, event_offset); | 544 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
545 | fprintf(fp, "\t\tkey %s\n", name); | 545 | fprintf(fp, "\t\tkey %s\n", name); |
546 | bytestream2char(name, mRawData, event_offset); | 546 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
547 | fprintf(fp, "\t\tinteger %s\n", name); | 547 | fprintf(fp, "\t\tinteger %s\n", name); |
548 | bytestream2char(name, mRawData, event_offset); | 548 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
549 | fprintf(fp, "\t\tinteger %s\n", name); | 549 | fprintf(fp, "\t\tinteger %s\n", name); |
550 | break; | 550 | break; |
551 | case LSTT_LINK_MESSAGE: // LSTT_LINK_MESSAGE | 551 | case LSTT_LINK_MESSAGE: // LSTT_LINK_MESSAGE |
552 | bytestream2char(name, mRawData, event_offset); | 552 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
553 | fprintf(fp, "%s\n", name); | 553 | fprintf(fp, "%s\n", name); |
554 | bytestream2char(name, mRawData, event_offset); | 554 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
555 | fprintf(fp, "\t\tinteger %s\n", name); | 555 | fprintf(fp, "\t\tinteger %s\n", name); |
556 | bytestream2char(name, mRawData, event_offset); | 556 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
557 | fprintf(fp, "\t\tstring %s\n", name); | 557 | fprintf(fp, "\t\tstring %s\n", name); |
558 | bytestream2char(name, mRawData, event_offset); | 558 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
559 | fprintf(fp, "\t\tkey %s\n", name); | 559 | fprintf(fp, "\t\tkey %s\n", name); |
560 | break; | 560 | break; |
561 | case LSTT_MONEY: // LSTT_MONEY | 561 | case LSTT_MONEY: // LSTT_MONEY |
562 | bytestream2char(name, mRawData, event_offset); | 562 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
563 | fprintf(fp, "%s\n", name); | 563 | fprintf(fp, "%s\n", name); |
564 | bytestream2char(name, mRawData, event_offset); | 564 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
565 | fprintf(fp, "\t\tkey %s\n", name); | 565 | fprintf(fp, "\t\tkey %s\n", name); |
566 | bytestream2char(name, mRawData, event_offset); | 566 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
567 | fprintf(fp, "\t\tinteger %s\n", name); | 567 | fprintf(fp, "\t\tinteger %s\n", name); |
568 | break; | 568 | break; |
569 | case LSTT_EMAIL: // LSTT_EMAIL | 569 | case LSTT_EMAIL: // LSTT_EMAIL |
570 | bytestream2char(name, mRawData, event_offset); | 570 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
571 | fprintf(fp, "%s\n", name); | 571 | fprintf(fp, "%s\n", name); |
572 | bytestream2char(name, mRawData, event_offset); | 572 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
573 | fprintf(fp, "\t\tstring %s\n", name); | 573 | fprintf(fp, "\t\tstring %s\n", name); |
574 | bytestream2char(name, mRawData, event_offset); | 574 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
575 | fprintf(fp, "\t\tstring %s\n", name); | 575 | fprintf(fp, "\t\tstring %s\n", name); |
576 | bytestream2char(name, mRawData, event_offset); | 576 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
577 | fprintf(fp, "\t\tstring %s\n", name); | 577 | fprintf(fp, "\t\tstring %s\n", name); |
578 | bytestream2char(name, mRawData, event_offset); | 578 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
579 | fprintf(fp, "\t\tinteger %s\n", name); | 579 | fprintf(fp, "\t\tinteger %s\n", name); |
580 | break; | 580 | break; |
581 | case LSTT_AT_TARGET: // LSTT_AT_TARGET | 581 | case LSTT_AT_TARGET: // LSTT_AT_TARGET |
582 | bytestream2char(name, mRawData, event_offset); | 582 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
583 | fprintf(fp, "%s\n", name); | 583 | fprintf(fp, "%s\n", name); |
584 | bytestream2char(name, mRawData, event_offset); | 584 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
585 | fprintf(fp, "\t\tinteger %s\n", name); | 585 | fprintf(fp, "\t\tinteger %s\n", name); |
586 | bytestream2char(name, mRawData, event_offset); | 586 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
587 | fprintf(fp, "\t\tvector %s\n", name); | 587 | fprintf(fp, "\t\tvector %s\n", name); |
588 | bytestream2char(name, mRawData, event_offset); | 588 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
589 | fprintf(fp, "\t\tvector %s\n", name); | 589 | fprintf(fp, "\t\tvector %s\n", name); |
590 | break; | 590 | break; |
591 | case LSTT_NOT_AT_TARGET: // LSTT_NOT_AT_TARGET | 591 | case LSTT_NOT_AT_TARGET: // LSTT_NOT_AT_TARGET |
592 | bytestream2char(name, mRawData, event_offset); | 592 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
593 | fprintf(fp, "%s\n", name); | 593 | fprintf(fp, "%s\n", name); |
594 | break; | 594 | break; |
595 | case LSTT_AT_ROT_TARGET: // LSTT_AT_ROT_TARGET | 595 | case LSTT_AT_ROT_TARGET: // LSTT_AT_ROT_TARGET |
596 | bytestream2char(name, mRawData, event_offset); | 596 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
597 | fprintf(fp, "%s\n", name); | 597 | fprintf(fp, "%s\n", name); |
598 | bytestream2char(name, mRawData, event_offset); | 598 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
599 | fprintf(fp, "\t\tinteger %s\n", name); | 599 | fprintf(fp, "\t\tinteger %s\n", name); |
600 | bytestream2char(name, mRawData, event_offset); | 600 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
601 | fprintf(fp, "\t\tquaternion %s\n", name); | 601 | fprintf(fp, "\t\tquaternion %s\n", name); |
602 | bytestream2char(name, mRawData, event_offset); | 602 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
603 | fprintf(fp, "\t\tquaternion %s\n", name); | 603 | fprintf(fp, "\t\tquaternion %s\n", name); |
604 | break; | 604 | break; |
605 | case LSTT_NOT_AT_ROT_TARGET: // LSTT_NOT_AT_TARGET | 605 | case LSTT_NOT_AT_ROT_TARGET: // LSTT_NOT_AT_TARGET |
606 | bytestream2char(name, mRawData, event_offset); | 606 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
607 | fprintf(fp, "%s\n", name); | 607 | fprintf(fp, "%s\n", name); |
608 | break; | 608 | break; |
609 | case LSTT_RTPERMISSIONS: // LSTT_RTPERMISSIONS | 609 | case LSTT_RTPERMISSIONS: // LSTT_RTPERMISSIONS |
610 | bytestream2char(name, mRawData, event_offset); | 610 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
611 | fprintf(fp, "%s\n", name); | 611 | fprintf(fp, "%s\n", name); |
612 | fprintf(fp, "\t\tinteger %s\n", name); | 612 | fprintf(fp, "\t\tinteger %s\n", name); |
613 | bytestream2char(name, mRawData, event_offset); | 613 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
614 | break; | 614 | break; |
615 | case LSTT_HTTP_RESPONSE: // LSTT_REMOTE_DATA ?!?!?! | 615 | case LSTT_HTTP_RESPONSE: // LSTT_REMOTE_DATA ?!?!?! |
616 | bytestream2char(name, mRawData, event_offset); | 616 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
617 | fprintf(fp, "%s\n", name); | 617 | fprintf(fp, "%s\n", name); |
618 | bytestream2char(name, mRawData, event_offset); | 618 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
619 | fprintf(fp, "\t\tkey %s\n", name); | 619 | fprintf(fp, "\t\tkey %s\n", name); |
620 | bytestream2char(name, mRawData, event_offset); | 620 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
621 | fprintf(fp, "\t\tinteger %s\n", name); | 621 | fprintf(fp, "\t\tinteger %s\n", name); |
622 | bytestream2char(name, mRawData, event_offset); | 622 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
623 | fprintf(fp, "\t\tlist %s\n", name); | 623 | fprintf(fp, "\t\tlist %s\n", name); |
624 | bytestream2char(name, mRawData, event_offset); | 624 | bytestream2char(name, mRawData, event_offset, sizeof(name)); |
625 | fprintf(fp, "\t\tstring %s\n", name); | 625 | fprintf(fp, "\t\tstring %s\n", name); |
626 | break; | 626 | break; |
627 | default: | 627 | default: |
@@ -1210,7 +1210,7 @@ void print_pushargs(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) | |||
1210 | char arg[1024]; /*Flawfinder: ignore*/ | 1210 | char arg[1024]; /*Flawfinder: ignore*/ |
1211 | lso_print_tabs(fp, tabs); | 1211 | lso_print_tabs(fp, tabs); |
1212 | fprintf(fp, "[0x%X]\tPUSHARGS ", offset++); | 1212 | fprintf(fp, "[0x%X]\tPUSHARGS ", offset++); |
1213 | bytestream2char(arg, buffer, offset); | 1213 | bytestream2char(arg, buffer, offset, sizeof(arg)); |
1214 | fprintf(fp, "%s\n", arg); | 1214 | fprintf(fp, "%s\n", arg); |
1215 | } | 1215 | } |
1216 | 1216 | ||