diff options
Diffstat (limited to '')
42 files changed, 385 insertions, 421 deletions
diff --git a/OpenSim.sln b/OpenSim.sln index 66e79d2..93a022d 100644 --- a/OpenSim.sln +++ b/OpenSim.sln | |||
@@ -1,5 +1,5 @@ | |||
1 | Microsoft Visual Studio Solution File, Format Version 9.00 | 1 | Microsoft Visual Studio Solution File, Format Version 9.00 |
2 | # Visual C# Express 2005 | 2 | # Visual Studio 2005 |
3 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim", "OpenSim\Region\Application\OpenSim.csproj", "{438A9556-0000-0000-0000-000000000000}" | 3 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim", "OpenSim\Region\Application\OpenSim.csproj", "{438A9556-0000-0000-0000-000000000000}" |
4 | EndProject | 4 | EndProject |
5 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework", "OpenSim\Framework\General\OpenSim.Framework.csproj", "{8ACA2445-0000-0000-0000-000000000000}" | 5 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework", "OpenSim\Framework\General\OpenSim.Framework.csproj", "{8ACA2445-0000-0000-0000-000000000000}" |
@@ -53,117 +53,197 @@ EndProject | |||
53 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleApp", "OpenSim\Region\Examples\SimpleApp\SimpleApp.csproj", "{24B12448-0000-0000-0000-000000000000}" | 53 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleApp", "OpenSim\Region\Examples\SimpleApp\SimpleApp.csproj", "{24B12448-0000-0000-0000-000000000000}" |
54 | EndProject | 54 | EndProject |
55 | Global | 55 | Global |
56 | GlobalSection(SolutionConfigurationPlatforms) = preSolution | 56 | GlobalSection(SolutionConfigurationPlatforms) = preSolution |
57 | Debug|Any CPU = Debug|Any CPU | 57 | Debug|Any CPU = Debug|Any CPU |
58 | Release|Any CPU = Release|Any CPU | 58 | Release|Any CPU = Release|Any CPU |
59 | EndGlobalSection | 59 | EndGlobalSection |
60 | GlobalSection(ProjectConfigurationPlatforms) = postSolution | 60 | GlobalSection(ProjectDependencies) = postSolution |
61 | {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 61 | ({438A9556-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000}) |
62 | {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 62 | ({438A9556-0000-0000-0000-000000000000}).4 = ({CB52B7E7-0000-0000-0000-000000000000}) |
63 | {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 63 | ({438A9556-0000-0000-0000-000000000000}).5 = ({A7CD0630-0000-0000-0000-000000000000}) |
64 | {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 64 | ({438A9556-0000-0000-0000-000000000000}).6 = ({36B72A9B-0000-0000-0000-000000000000}) |
65 | {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 65 | ({438A9556-0000-0000-0000-000000000000}).7 = ({C74E4A30-0000-0000-0000-000000000000}) |
66 | {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 66 | ({438A9556-0000-0000-0000-000000000000}).8 = ({2CC71860-0000-0000-0000-000000000000}) |
67 | {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 67 | ({438A9556-0000-0000-0000-000000000000}).9 = ({586E2916-0000-0000-0000-000000000000}) |
68 | {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 68 | ({438A9556-0000-0000-0000-000000000000}).10 = ({61FCCDB3-0000-0000-0000-000000000000}) |
69 | {CB52B7E7-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 69 | ({438A9556-0000-0000-0000-000000000000}).11 = ({DC3698B2-0000-0000-0000-000000000000}) |
70 | {CB52B7E7-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 70 | ({438A9556-0000-0000-0000-000000000000}).12 = ({BFB5D807-0000-0000-0000-000000000000}) |
71 | {CB52B7E7-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 71 | ({438A9556-0000-0000-0000-000000000000}).13 = ({4806E378-0000-0000-0000-000000000000}) |
72 | {CB52B7E7-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 72 | ({438A9556-0000-0000-0000-000000000000}).14 = ({DCBA491C-0000-0000-0000-000000000000}) |
73 | {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 73 | ({438A9556-0000-0000-0000-000000000000}).15 = ({F4FF31EB-0000-0000-0000-000000000000}) |
74 | {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 74 | ({438A9556-0000-0000-0000-000000000000}).16 = ({C9E0F891-0000-0000-0000-000000000000}) |
75 | {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 75 | ({8ACA2445-0000-0000-0000-000000000000}).2 = ({A7CD0630-0000-0000-0000-000000000000}) |
76 | {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 76 | ({CB52B7E7-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000}) |
77 | {36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 77 | ({CB52B7E7-0000-0000-0000-000000000000}).2 = ({36B72A9B-0000-0000-0000-000000000000}) |
78 | {36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 78 | ({FD2D303D-0000-0000-0000-000000000000}).2 = ({36B72A9B-0000-0000-0000-000000000000}) |
79 | {36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 79 | ({C74E4A30-0000-0000-0000-000000000000}).0 = ({8ACA2445-0000-0000-0000-000000000000}) |
80 | {36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 80 | ({2CC71860-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000}) |
81 | {FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 81 | ({2CC71860-0000-0000-0000-000000000000}).2 = ({A7CD0630-0000-0000-0000-000000000000}) |
82 | {FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 82 | ({586E2916-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000}) |
83 | {FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 83 | ({586E2916-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000}) |
84 | {FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 84 | ({586E2916-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000}) |
85 | {C74E4A30-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 85 | ({586E2916-0000-0000-0000-000000000000}).5 = ({C74E4A30-0000-0000-0000-000000000000}) |
86 | {C74E4A30-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 86 | ({586E2916-0000-0000-0000-000000000000}).6 = ({2CC71860-0000-0000-0000-000000000000}) |
87 | {C74E4A30-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 87 | ({61FCCDB3-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000}) |
88 | {C74E4A30-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 88 | ({39038E85-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000}) |
89 | {2CC71860-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 89 | ({39038E85-0000-0000-0000-000000000000}).2 = ({2CC71860-0000-0000-0000-000000000000}) |
90 | {2CC71860-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 90 | ({39038E85-0000-0000-0000-000000000000}).3 = ({61FCCDB3-0000-0000-0000-000000000000}) |
91 | {2CC71860-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 91 | ({DC3698B2-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000}) |
92 | {2CC71860-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 92 | ({DC3698B2-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000}) |
93 | {586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 93 | ({DC3698B2-0000-0000-0000-000000000000}).5 = ({2CC71860-0000-0000-0000-000000000000}) |
94 | {586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 94 | ({DC3698B2-0000-0000-0000-000000000000}).6 = ({61FCCDB3-0000-0000-0000-000000000000}) |
95 | {586E2916-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 95 | ({DC3698B2-0000-0000-0000-000000000000}).7 = ({F4FF31EB-0000-0000-0000-000000000000}) |
96 | {586E2916-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 96 | ({DC3698B2-0000-0000-0000-000000000000}).8 = ({C9E0F891-0000-0000-0000-000000000000}) |
97 | {61FCCDB3-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 97 | ({BFB5D807-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000}) |
98 | {61FCCDB3-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 98 | ({BFB5D807-0000-0000-0000-000000000000}).2 = ({CB52B7E7-0000-0000-0000-000000000000}) |
99 | {61FCCDB3-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 99 | ({BFB5D807-0000-0000-0000-000000000000}).3 = ({36B72A9B-0000-0000-0000-000000000000}) |
100 | {61FCCDB3-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 100 | ({BFB5D807-0000-0000-0000-000000000000}).4 = ({586E2916-0000-0000-0000-000000000000}) |
101 | {39038E85-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 101 | ({4806E378-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000}) |
102 | {39038E85-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 102 | ({4806E378-0000-0000-0000-000000000000}).2 = ({CB52B7E7-0000-0000-0000-000000000000}) |
103 | {39038E85-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 103 | ({4806E378-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000}) |
104 | {39038E85-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 104 | ({4806E378-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000}) |
105 | {DC3698B2-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 105 | ({4806E378-0000-0000-0000-000000000000}).5 = ({2CC71860-0000-0000-0000-000000000000}) |
106 | {DC3698B2-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 106 | ({DCBA491C-0000-0000-0000-000000000000}).4 = ({8ACA2445-0000-0000-0000-000000000000}) |
107 | {DC3698B2-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 107 | ({DCBA491C-0000-0000-0000-000000000000}).5 = ({CB52B7E7-0000-0000-0000-000000000000}) |
108 | {DC3698B2-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 108 | ({DCBA491C-0000-0000-0000-000000000000}).6 = ({A7CD0630-0000-0000-0000-000000000000}) |
109 | {BFB5D807-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 109 | ({DCBA491C-0000-0000-0000-000000000000}).7 = ({C74E4A30-0000-0000-0000-000000000000}) |
110 | {BFB5D807-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 110 | ({DCBA491C-0000-0000-0000-000000000000}).8 = ({2CC71860-0000-0000-0000-000000000000}) |
111 | {BFB5D807-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 111 | ({DCBA491C-0000-0000-0000-000000000000}).9 = ({61FCCDB3-0000-0000-0000-000000000000}) |
112 | {BFB5D807-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 112 | ({DCBA491C-0000-0000-0000-000000000000}).10 = ({39038E85-0000-0000-0000-000000000000}) |
113 | {4806E378-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 113 | ({DCBA491C-0000-0000-0000-000000000000}).11 = ({F4FF31EB-0000-0000-0000-000000000000}) |
114 | {4806E378-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 114 | ({DCBA491C-0000-0000-0000-000000000000}).12 = ({C9E0F891-0000-0000-0000-000000000000}) |
115 | {4806E378-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 115 | ({241A8CDD-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000}) |
116 | {4806E378-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 116 | ({241A8CDD-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000}) |
117 | {DCBA491C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 117 | ({98C7B681-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000}) |
118 | {DCBA491C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 118 | ({98C7B681-0000-0000-0000-000000000000}).2 = ({A7CD0630-0000-0000-0000-000000000000}) |
119 | {DCBA491C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 119 | ({15B4FEF3-0000-0000-0000-000000000000}).1 = ({F4FF31EB-0000-0000-0000-000000000000}) |
120 | {DCBA491C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 120 | ({F4FF31EB-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000}) |
121 | {241A8CDD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 121 | ({F4FF31EB-0000-0000-0000-000000000000}).2 = ({A7CD0630-0000-0000-0000-000000000000}) |
122 | {241A8CDD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 122 | ({90620634-0000-0000-0000-000000000000}).2 = ({F4FF31EB-0000-0000-0000-000000000000}) |
123 | {241A8CDD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 123 | ({A6D191D8-0000-0000-0000-000000000000}).1 = ({F4FF31EB-0000-0000-0000-000000000000}) |
124 | {241A8CDD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 124 | ({A4691E59-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000}) |
125 | {98C7B681-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 125 | ({A4691E59-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000}) |
126 | {98C7B681-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 126 | ({43DB702D-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000}) |
127 | {98C7B681-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 127 | ({43DB702D-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000}) |
128 | {98C7B681-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 128 | ({477B9270-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000}) |
129 | {15B4FEF3-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 129 | ({477B9270-0000-0000-0000-000000000000}).2 = ({A7CD0630-0000-0000-0000-000000000000}) |
130 | {15B4FEF3-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 130 | ({24B12448-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000}) |
131 | {15B4FEF3-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 131 | ({24B12448-0000-0000-0000-000000000000}).2 = ({CB52B7E7-0000-0000-0000-000000000000}) |
132 | {15B4FEF3-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 132 | ({24B12448-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000}) |
133 | {F4FF31EB-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 133 | ({24B12448-0000-0000-0000-000000000000}).4 = ({2CC71860-0000-0000-0000-000000000000}) |
134 | {F4FF31EB-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 134 | ({24B12448-0000-0000-0000-000000000000}).5 = ({61FCCDB3-0000-0000-0000-000000000000}) |
135 | {F4FF31EB-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 135 | ({24B12448-0000-0000-0000-000000000000}).6 = ({DC3698B2-0000-0000-0000-000000000000}) |
136 | {F4FF31EB-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 136 | ({24B12448-0000-0000-0000-000000000000}).7 = ({BFB5D807-0000-0000-0000-000000000000}) |
137 | {90620634-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 137 | ({24B12448-0000-0000-0000-000000000000}).8 = ({DCBA491C-0000-0000-0000-000000000000}) |
138 | {90620634-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 138 | ({24B12448-0000-0000-0000-000000000000}).9 = ({241A8CDD-0000-0000-0000-000000000000}) |
139 | {90620634-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 139 | EndGlobalSection |
140 | {90620634-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 140 | GlobalSection(ProjectConfigurationPlatforms) = postSolution |
141 | {A6D191D8-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 141 | {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
142 | {A6D191D8-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 142 | {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
143 | {A6D191D8-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 143 | {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
144 | {A6D191D8-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 144 | {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
145 | {A4691E59-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 145 | {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
146 | {A4691E59-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 146 | {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
147 | {A4691E59-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 147 | {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
148 | {A4691E59-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 148 | {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
149 | {43DB702D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 149 | {CB52B7E7-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
150 | {43DB702D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 150 | {CB52B7E7-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
151 | {43DB702D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 151 | {CB52B7E7-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
152 | {43DB702D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 152 | {CB52B7E7-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
153 | {477B9270-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 153 | {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
154 | {477B9270-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 154 | {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
155 | {477B9270-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 155 | {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
156 | {477B9270-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 156 | {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
157 | {C9E0F891-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 157 | {36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
158 | {C9E0F891-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 158 | {36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
159 | {C9E0F891-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 159 | {36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
160 | {C9E0F891-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 160 | {36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
161 | {24B12448-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 161 | {FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
162 | {24B12448-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 162 | {FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
163 | {24B12448-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 163 | {FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
164 | {24B12448-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 164 | {FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
165 | EndGlobalSection | 165 | {C74E4A30-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
166 | GlobalSection(SolutionProperties) = preSolution | 166 | {C74E4A30-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
167 | HideSolutionNode = FALSE | 167 | {C74E4A30-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
168 | EndGlobalSection | 168 | {C74E4A30-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
169 | {2CC71860-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
170 | {2CC71860-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
171 | {2CC71860-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
172 | {2CC71860-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
173 | {586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
174 | {586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
175 | {586E2916-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
176 | {586E2916-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
177 | {61FCCDB3-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
178 | {61FCCDB3-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
179 | {61FCCDB3-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
180 | {61FCCDB3-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
181 | {39038E85-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
182 | {39038E85-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
183 | {39038E85-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
184 | {39038E85-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
185 | {DC3698B2-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
186 | {DC3698B2-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
187 | {DC3698B2-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
188 | {DC3698B2-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
189 | {BFB5D807-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
190 | {BFB5D807-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
191 | {BFB5D807-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
192 | {BFB5D807-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
193 | {4806E378-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
194 | {4806E378-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
195 | {4806E378-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
196 | {4806E378-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
197 | {DCBA491C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
198 | {DCBA491C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
199 | {DCBA491C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
200 | {DCBA491C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
201 | {241A8CDD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
202 | {241A8CDD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
203 | {241A8CDD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
204 | {241A8CDD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
205 | {98C7B681-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
206 | {98C7B681-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
207 | {98C7B681-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
208 | {98C7B681-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
209 | {15B4FEF3-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
210 | {15B4FEF3-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
211 | {15B4FEF3-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
212 | {15B4FEF3-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
213 | {F4FF31EB-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
214 | {F4FF31EB-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
215 | {F4FF31EB-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
216 | {F4FF31EB-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
217 | {90620634-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
218 | {90620634-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
219 | {90620634-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
220 | {90620634-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
221 | {A6D191D8-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
222 | {A6D191D8-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
223 | {A6D191D8-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
224 | {A6D191D8-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
225 | {A4691E59-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
226 | {A4691E59-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
227 | {A4691E59-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
228 | {A4691E59-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
229 | {43DB702D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
230 | {43DB702D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
231 | {43DB702D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
232 | {43DB702D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
233 | {477B9270-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
234 | {477B9270-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
235 | {477B9270-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
236 | {477B9270-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
237 | {C9E0F891-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
238 | {C9E0F891-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
239 | {C9E0F891-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
240 | {C9E0F891-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
241 | {24B12448-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
242 | {24B12448-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
243 | {24B12448-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
244 | {24B12448-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
245 | EndGlobalSection | ||
246 | GlobalSection(SolutionProperties) = preSolution | ||
247 | HideSolutionNode = FALSE | ||
248 | EndGlobalSection | ||
169 | EndGlobal | 249 | EndGlobal |
diff --git a/OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj b/OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj index 66507a8..31ab172 100644 --- a/OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj +++ b/OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj | |||
@@ -86,6 +86,9 @@ | |||
86 | </ProjectReference> | 86 | </ProjectReference> |
87 | </ItemGroup> | 87 | </ItemGroup> |
88 | <ItemGroup> | 88 | <ItemGroup> |
89 | <Compile Include="CommunicationsManager.cs"> | ||
90 | <SubType>Code</SubType> | ||
91 | </Compile> | ||
89 | <Compile Include="IGridServices.cs"> | 92 | <Compile Include="IGridServices.cs"> |
90 | <SubType>Code</SubType> | 93 | <SubType>Code</SubType> |
91 | </Compile> | 94 | </Compile> |
@@ -95,9 +98,6 @@ | |||
95 | <Compile Include="IUserServices.cs"> | 98 | <Compile Include="IUserServices.cs"> |
96 | <SubType>Code</SubType> | 99 | <SubType>Code</SubType> |
97 | </Compile> | 100 | </Compile> |
98 | <Compile Include="CommunicationsManager.cs"> | ||
99 | <SubType>Code</SubType> | ||
100 | </Compile> | ||
101 | <Compile Include="Properties\AssemblyInfo.cs"> | 101 | <Compile Include="Properties\AssemblyInfo.cs"> |
102 | <SubType>Code</SubType> | 102 | <SubType>Code</SubType> |
103 | </Compile> | 103 | </Compile> |
diff --git a/OpenSim/Framework/Communications/OpenSim.Framework.Communications.dll.build b/OpenSim/Framework/Communications/OpenSim.Framework.Communications.dll.build index 1c55d8c..52d29f6 100644 --- a/OpenSim/Framework/Communications/OpenSim.Framework.Communications.dll.build +++ b/OpenSim/Framework/Communications/OpenSim.Framework.Communications.dll.build | |||
@@ -11,10 +11,10 @@ | |||
11 | <resources prefix="OpenSim.Framework.Communications" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.Framework.Communications" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="CommunicationsManager.cs" /> | ||
14 | <include name="IGridServices.cs" /> | 15 | <include name="IGridServices.cs" /> |
15 | <include name="IInterRegionCommunications.cs" /> | 16 | <include name="IInterRegionCommunications.cs" /> |
16 | <include name="IUserServices.cs" /> | 17 | <include name="IUserServices.cs" /> |
17 | <include name="CommunicationsManager.cs" /> | ||
18 | <include name="Properties/AssemblyInfo.cs" /> | 18 | <include name="Properties/AssemblyInfo.cs" /> |
19 | </sources> | 19 | </sources> |
20 | <references basedir="${project::get-base-directory()}"> | 20 | <references basedir="${project::get-base-directory()}"> |
diff --git a/OpenSim/Framework/Console/OpenSim.Framework.Console.csproj b/OpenSim/Framework/Console/OpenSim.Framework.Console.csproj index c02a506..f3dcec5 100644 --- a/OpenSim/Framework/Console/OpenSim.Framework.Console.csproj +++ b/OpenSim/Framework/Console/OpenSim.Framework.Console.csproj | |||
@@ -69,10 +69,10 @@ | |||
69 | <Compile Include="AssemblyInfo.cs"> | 69 | <Compile Include="AssemblyInfo.cs"> |
70 | <SubType>Code</SubType> | 70 | <SubType>Code</SubType> |
71 | </Compile> | 71 | </Compile> |
72 | <Compile Include="LogBase.cs"> | 72 | <Compile Include="ConsoleCallbacksBase.cs"> |
73 | <SubType>Code</SubType> | 73 | <SubType>Code</SubType> |
74 | </Compile> | 74 | </Compile> |
75 | <Compile Include="ConsoleCallbacksBase.cs"> | 75 | <Compile Include="LogBase.cs"> |
76 | <SubType>Code</SubType> | 76 | <SubType>Code</SubType> |
77 | </Compile> | 77 | </Compile> |
78 | <Compile Include="MainLog.cs"> | 78 | <Compile Include="MainLog.cs"> |
diff --git a/OpenSim/Framework/Console/OpenSim.Framework.Console.dll.build b/OpenSim/Framework/Console/OpenSim.Framework.Console.dll.build index 10e72a1..eb40c0d 100644 --- a/OpenSim/Framework/Console/OpenSim.Framework.Console.dll.build +++ b/OpenSim/Framework/Console/OpenSim.Framework.Console.dll.build | |||
@@ -12,8 +12,8 @@ | |||
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="AssemblyInfo.cs" /> | 14 | <include name="AssemblyInfo.cs" /> |
15 | <include name="LogBase.cs" /> | ||
16 | <include name="ConsoleCallbacksBase.cs" /> | 15 | <include name="ConsoleCallbacksBase.cs" /> |
16 | <include name="LogBase.cs" /> | ||
17 | <include name="MainLog.cs" /> | 17 | <include name="MainLog.cs" /> |
18 | </sources> | 18 | </sources> |
19 | <references basedir="${project::get-base-directory()}"> | 19 | <references basedir="${project::get-base-directory()}"> |
diff --git a/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.csproj b/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.csproj index f6e8311..b09cecf 100644 --- a/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.csproj +++ b/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.csproj | |||
@@ -88,13 +88,13 @@ | |||
88 | </ProjectReference> | 88 | </ProjectReference> |
89 | </ItemGroup> | 89 | </ItemGroup> |
90 | <ItemGroup> | 90 | <ItemGroup> |
91 | <Compile Include="DB4oUserData.cs"> | 91 | <Compile Include="DB4oGridData.cs"> |
92 | <SubType>Code</SubType> | 92 | <SubType>Code</SubType> |
93 | </Compile> | 93 | </Compile> |
94 | <Compile Include="DB4oManager.cs"> | 94 | <Compile Include="DB4oManager.cs"> |
95 | <SubType>Code</SubType> | 95 | <SubType>Code</SubType> |
96 | </Compile> | 96 | </Compile> |
97 | <Compile Include="DB4oGridData.cs"> | 97 | <Compile Include="DB4oUserData.cs"> |
98 | <SubType>Code</SubType> | 98 | <SubType>Code</SubType> |
99 | </Compile> | 99 | </Compile> |
100 | <Compile Include="Properties\AssemblyInfo.cs"> | 100 | <Compile Include="Properties\AssemblyInfo.cs"> |
diff --git a/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.dll.build b/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.dll.build index 2c5e31b..f124eb5 100644 --- a/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.dll.build +++ b/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.dll.build | |||
@@ -11,9 +11,9 @@ | |||
11 | <resources prefix="OpenSim.Framework.Data.DB4o" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.Framework.Data.DB4o" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="DB4oUserData.cs" /> | ||
15 | <include name="DB4oManager.cs" /> | ||
16 | <include name="DB4oGridData.cs" /> | 14 | <include name="DB4oGridData.cs" /> |
15 | <include name="DB4oManager.cs" /> | ||
16 | <include name="DB4oUserData.cs" /> | ||
17 | <include name="Properties/AssemblyInfo.cs" /> | 17 | <include name="Properties/AssemblyInfo.cs" /> |
18 | </sources> | 18 | </sources> |
19 | <references basedir="${project::get-base-directory()}"> | 19 | <references basedir="${project::get-base-directory()}"> |
diff --git a/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj b/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj index 09a32b5..62e3887 100644 --- a/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj +++ b/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj | |||
@@ -88,19 +88,19 @@ | |||
88 | </ProjectReference> | 88 | </ProjectReference> |
89 | </ItemGroup> | 89 | </ItemGroup> |
90 | <ItemGroup> | 90 | <ItemGroup> |
91 | <Compile Include="MySQLInventoryData.cs"> | 91 | <Compile Include="MySQLGridData.cs"> |
92 | <SubType>Code</SubType> | 92 | <SubType>Code</SubType> |
93 | </Compile> | 93 | </Compile> |
94 | <Compile Include="MySQLUserData.cs"> | 94 | <Compile Include="MySQLInventoryData.cs"> |
95 | <SubType>Code</SubType> | 95 | <SubType>Code</SubType> |
96 | </Compile> | 96 | </Compile> |
97 | <Compile Include="MySQLManager.cs"> | 97 | <Compile Include="MySQLLogData.cs"> |
98 | <SubType>Code</SubType> | 98 | <SubType>Code</SubType> |
99 | </Compile> | 99 | </Compile> |
100 | <Compile Include="MySQLLogData.cs"> | 100 | <Compile Include="MySQLManager.cs"> |
101 | <SubType>Code</SubType> | 101 | <SubType>Code</SubType> |
102 | </Compile> | 102 | </Compile> |
103 | <Compile Include="MySQLGridData.cs"> | 103 | <Compile Include="MySQLUserData.cs"> |
104 | <SubType>Code</SubType> | 104 | <SubType>Code</SubType> |
105 | </Compile> | 105 | </Compile> |
106 | <Compile Include="Properties\AssemblyInfo.cs"> | 106 | <Compile Include="Properties\AssemblyInfo.cs"> |
diff --git a/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.dll.build b/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.dll.build index 3aeebbc..594ec52 100644 --- a/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.dll.build +++ b/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.dll.build | |||
@@ -11,11 +11,11 @@ | |||
11 | <resources prefix="OpenSim.Framework.Data.MySQL" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.Framework.Data.MySQL" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="MySQLGridData.cs" /> | ||
14 | <include name="MySQLInventoryData.cs" /> | 15 | <include name="MySQLInventoryData.cs" /> |
15 | <include name="MySQLUserData.cs" /> | ||
16 | <include name="MySQLManager.cs" /> | ||
17 | <include name="MySQLLogData.cs" /> | 16 | <include name="MySQLLogData.cs" /> |
18 | <include name="MySQLGridData.cs" /> | 17 | <include name="MySQLManager.cs" /> |
18 | <include name="MySQLUserData.cs" /> | ||
19 | <include name="Properties/AssemblyInfo.cs" /> | 19 | <include name="Properties/AssemblyInfo.cs" /> |
20 | </sources> | 20 | </sources> |
21 | <references basedir="${project::get-base-directory()}"> | 21 | <references basedir="${project::get-base-directory()}"> |
diff --git a/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj b/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj index dab22ea..4ba24f1 100644 --- a/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj +++ b/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj | |||
@@ -88,10 +88,10 @@ | |||
88 | </ProjectReference> | 88 | </ProjectReference> |
89 | </ItemGroup> | 89 | </ItemGroup> |
90 | <ItemGroup> | 90 | <ItemGroup> |
91 | <Compile Include="SQLiteManager.cs"> | 91 | <Compile Include="SQLiteGridData.cs"> |
92 | <SubType>Code</SubType> | 92 | <SubType>Code</SubType> |
93 | </Compile> | 93 | </Compile> |
94 | <Compile Include="SQLiteGridData.cs"> | 94 | <Compile Include="SQLiteManager.cs"> |
95 | <SubType>Code</SubType> | 95 | <SubType>Code</SubType> |
96 | </Compile> | 96 | </Compile> |
97 | <Compile Include="Properties\AssemblyInfo.cs"> | 97 | <Compile Include="Properties\AssemblyInfo.cs"> |
diff --git a/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.dll.build b/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.dll.build index 719fbc6..e28d0a6 100644 --- a/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.dll.build +++ b/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.dll.build | |||
@@ -11,8 +11,8 @@ | |||
11 | <resources prefix="OpenSim.Framework.Data.SQLite" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.Framework.Data.SQLite" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="SQLiteManager.cs" /> | ||
15 | <include name="SQLiteGridData.cs" /> | 14 | <include name="SQLiteGridData.cs" /> |
15 | <include name="SQLiteManager.cs" /> | ||
16 | <include name="Properties/AssemblyInfo.cs" /> | 16 | <include name="Properties/AssemblyInfo.cs" /> |
17 | </sources> | 17 | </sources> |
18 | <references basedir="${project::get-base-directory()}"> | 18 | <references basedir="${project::get-base-directory()}"> |
diff --git a/OpenSim/Framework/Data/OpenSim.Framework.Data.csproj b/OpenSim/Framework/Data/OpenSim.Framework.Data.csproj index 47b9ba3..dcafbcd 100644 --- a/OpenSim/Framework/Data/OpenSim.Framework.Data.csproj +++ b/OpenSim/Framework/Data/OpenSim.Framework.Data.csproj | |||
@@ -78,15 +78,9 @@ | |||
78 | <ItemGroup> | 78 | <ItemGroup> |
79 | </ItemGroup> | 79 | </ItemGroup> |
80 | <ItemGroup> | 80 | <ItemGroup> |
81 | <Compile Include="ReservationData.cs"> | ||
82 | <SubType>Code</SubType> | ||
83 | </Compile> | ||
84 | <Compile Include="GridData.cs"> | 81 | <Compile Include="GridData.cs"> |
85 | <SubType>Code</SubType> | 82 | <SubType>Code</SubType> |
86 | </Compile> | 83 | </Compile> |
87 | <Compile Include="SimProfileData.cs"> | ||
88 | <SubType>Code</SubType> | ||
89 | </Compile> | ||
90 | <Compile Include="ILogData.cs"> | 84 | <Compile Include="ILogData.cs"> |
91 | <SubType>Code</SubType> | 85 | <SubType>Code</SubType> |
92 | </Compile> | 86 | </Compile> |
@@ -96,6 +90,12 @@ | |||
96 | <Compile Include="InventoryData.cs"> | 90 | <Compile Include="InventoryData.cs"> |
97 | <SubType>Code</SubType> | 91 | <SubType>Code</SubType> |
98 | </Compile> | 92 | </Compile> |
93 | <Compile Include="ReservationData.cs"> | ||
94 | <SubType>Code</SubType> | ||
95 | </Compile> | ||
96 | <Compile Include="SimProfileData.cs"> | ||
97 | <SubType>Code</SubType> | ||
98 | </Compile> | ||
99 | <Compile Include="UserData.cs"> | 99 | <Compile Include="UserData.cs"> |
100 | <SubType>Code</SubType> | 100 | <SubType>Code</SubType> |
101 | </Compile> | 101 | </Compile> |
diff --git a/OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build b/OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build index 881bb3a..aefb02b 100644 --- a/OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build +++ b/OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build | |||
@@ -11,12 +11,12 @@ | |||
11 | <resources prefix="OpenSim.Framework.Data" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.Framework.Data" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="ReservationData.cs" /> | ||
15 | <include name="GridData.cs" /> | 14 | <include name="GridData.cs" /> |
16 | <include name="SimProfileData.cs" /> | ||
17 | <include name="ILogData.cs" /> | 15 | <include name="ILogData.cs" /> |
18 | <include name="IniConfig.cs" /> | 16 | <include name="IniConfig.cs" /> |
19 | <include name="InventoryData.cs" /> | 17 | <include name="InventoryData.cs" /> |
18 | <include name="ReservationData.cs" /> | ||
19 | <include name="SimProfileData.cs" /> | ||
20 | <include name="UserData.cs" /> | 20 | <include name="UserData.cs" /> |
21 | <include name="UserProfileData.cs" /> | 21 | <include name="UserProfileData.cs" /> |
22 | <include name="Properties/AssemblyInfo.cs" /> | 22 | <include name="Properties/AssemblyInfo.cs" /> |
diff --git a/OpenSim/Framework/General/OpenSim.Framework.csproj b/OpenSim/Framework/General/OpenSim.Framework.csproj index fbbf568..48db634 100644 --- a/OpenSim/Framework/General/OpenSim.Framework.csproj +++ b/OpenSim/Framework/General/OpenSim.Framework.csproj | |||
@@ -91,106 +91,106 @@ | |||
91 | <Compile Include="AgentInventory.cs"> | 91 | <Compile Include="AgentInventory.cs"> |
92 | <SubType>Code</SubType> | 92 | <SubType>Code</SubType> |
93 | </Compile> | 93 | </Compile> |
94 | <Compile Include="Util.cs"> | ||
95 | <SubType>Code</SubType> | ||
96 | </Compile> | ||
97 | <Compile Include="AuthenticateSessionBase.cs"> | 94 | <Compile Include="AuthenticateSessionBase.cs"> |
98 | <SubType>Code</SubType> | 95 | <SubType>Code</SubType> |
99 | </Compile> | 96 | </Compile> |
100 | <Compile Include="Logger.cs"> | 97 | <Compile Include="BlockingQueue.cs"> |
101 | <SubType>Code</SubType> | 98 | <SubType>Code</SubType> |
102 | </Compile> | 99 | </Compile> |
103 | <Compile Include="Remoting.cs"> | 100 | <Compile Include="IRegionCommsListener.cs"> |
104 | <SubType>Code</SubType> | 101 | <SubType>Code</SubType> |
105 | </Compile> | 102 | </Compile> |
106 | <Compile Include="RegionCommsListener.cs"> | 103 | <Compile Include="Logger.cs"> |
107 | <SubType>Code</SubType> | 104 | <SubType>Code</SubType> |
108 | </Compile> | 105 | </Compile> |
109 | <Compile Include="LoginService.cs"> | 106 | <Compile Include="LoginService.cs"> |
110 | <SubType>Code</SubType> | 107 | <SubType>Code</SubType> |
111 | </Compile> | 108 | </Compile> |
112 | <Compile Include="BlockingQueue.cs"> | 109 | <Compile Include="RegionCommsListener.cs"> |
113 | <SubType>Code</SubType> | 110 | <SubType>Code</SubType> |
114 | </Compile> | 111 | </Compile> |
115 | <Compile Include="UserProfile.cs"> | 112 | <Compile Include="Remoting.cs"> |
116 | <SubType>Code</SubType> | 113 | <SubType>Code</SubType> |
117 | </Compile> | 114 | </Compile> |
118 | <Compile Include="IRegionCommsListener.cs"> | 115 | <Compile Include="SimProfile.cs"> |
119 | <SubType>Code</SubType> | 116 | <SubType>Code</SubType> |
120 | </Compile> | 117 | </Compile> |
121 | <Compile Include="SimProfile.cs"> | 118 | <Compile Include="UserProfile.cs"> |
122 | <SubType>Code</SubType> | 119 | <SubType>Code</SubType> |
123 | </Compile> | 120 | </Compile> |
124 | <Compile Include="Interfaces\AuthenticateResponse.cs"> | 121 | <Compile Include="Util.cs"> |
125 | <SubType>Code</SubType> | 122 | <SubType>Code</SubType> |
126 | </Compile> | 123 | </Compile> |
127 | <Compile Include="Interfaces\IUserServer.cs"> | 124 | <Compile Include="Interfaces\AuthenticateResponse.cs"> |
128 | <SubType>Code</SubType> | 125 | <SubType>Code</SubType> |
129 | </Compile> | 126 | </Compile> |
130 | <Compile Include="Interfaces\IAssetServer.cs"> | 127 | <Compile Include="Interfaces\IAssetServer.cs"> |
131 | <SubType>Code</SubType> | 128 | <SubType>Code</SubType> |
132 | </Compile> | 129 | </Compile> |
133 | <Compile Include="Interfaces\IWorld.cs"> | 130 | <Compile Include="Interfaces\IClientAPI.cs"> |
134 | <SubType>Code</SubType> | 131 | <SubType>Code</SubType> |
135 | </Compile> | 132 | </Compile> |
136 | <Compile Include="Interfaces\ILocalStorage.cs"> | 133 | <Compile Include="Interfaces\ILocalStorage.cs"> |
137 | <SubType>Code</SubType> | 134 | <SubType>Code</SubType> |
138 | </Compile> | 135 | </Compile> |
139 | <Compile Include="Interfaces\IClientAPI.cs"> | 136 | <Compile Include="Interfaces\IUserServer.cs"> |
140 | <SubType>Code</SubType> | 137 | <SubType>Code</SubType> |
141 | </Compile> | 138 | </Compile> |
142 | <Compile Include="Interfaces\Config\IGenericConfig.cs"> | 139 | <Compile Include="Interfaces\IWorld.cs"> |
143 | <SubType>Code</SubType> | 140 | <SubType>Code</SubType> |
144 | </Compile> | 141 | </Compile> |
145 | <Compile Include="Interfaces\Config\IUserConfig.cs"> | 142 | <Compile Include="Interfaces\Config\IGenericConfig.cs"> |
146 | <SubType>Code</SubType> | 143 | <SubType>Code</SubType> |
147 | </Compile> | 144 | </Compile> |
148 | <Compile Include="Interfaces\Config\IGridConfig.cs"> | 145 | <Compile Include="Interfaces\Config\IGridConfig.cs"> |
149 | <SubType>Code</SubType> | 146 | <SubType>Code</SubType> |
150 | </Compile> | 147 | </Compile> |
148 | <Compile Include="Interfaces\Config\IUserConfig.cs"> | ||
149 | <SubType>Code</SubType> | ||
150 | </Compile> | ||
151 | <Compile Include="Properties\AssemblyInfo.cs"> | 151 | <Compile Include="Properties\AssemblyInfo.cs"> |
152 | <SubType>Code</SubType> | 152 | <SubType>Code</SubType> |
153 | </Compile> | 153 | </Compile> |
154 | <Compile Include="Types\NeighbourInfo.cs"> | 154 | <Compile Include="Types\AgentCiruitData.cs"> |
155 | <SubType>Code</SubType> | 155 | <SubType>Code</SubType> |
156 | </Compile> | 156 | </Compile> |
157 | <Compile Include="Types\RegionHandle.cs"> | 157 | <Compile Include="Types\AgentWearable.cs"> |
158 | <SubType>Code</SubType> | 158 | <SubType>Code</SubType> |
159 | </Compile> | 159 | </Compile> |
160 | <Compile Include="Types\RegionInfo.cs"> | 160 | <Compile Include="Types\AssetBase.cs"> |
161 | <SubType>Code</SubType> | 161 | <SubType>Code</SubType> |
162 | </Compile> | 162 | </Compile> |
163 | <Compile Include="Types\ParcelData.cs"> | 163 | <Compile Include="Types\AssetLandmark.cs"> |
164 | <SubType>Code</SubType> | 164 | <SubType>Code</SubType> |
165 | </Compile> | 165 | </Compile> |
166 | <Compile Include="Types\AgentWearable.cs"> | 166 | <Compile Include="Types\AssetStorage.cs"> |
167 | <SubType>Code</SubType> | 167 | <SubType>Code</SubType> |
168 | </Compile> | 168 | </Compile> |
169 | <Compile Include="Types\PrimData.cs"> | 169 | <Compile Include="Types\EstateSettings.cs"> |
170 | <SubType>Code</SubType> | 170 | <SubType>Code</SubType> |
171 | </Compile> | 171 | </Compile> |
172 | <Compile Include="Types\MapBlockData.cs"> | 172 | <Compile Include="Types\Login.cs"> |
173 | <SubType>Code</SubType> | 173 | <SubType>Code</SubType> |
174 | </Compile> | 174 | </Compile> |
175 | <Compile Include="Types\AssetStorage.cs"> | 175 | <Compile Include="Types\MapBlockData.cs"> |
176 | <SubType>Code</SubType> | 176 | <SubType>Code</SubType> |
177 | </Compile> | 177 | </Compile> |
178 | <Compile Include="Types\EstateSettings.cs"> | 178 | <Compile Include="Types\NeighbourInfo.cs"> |
179 | <SubType>Code</SubType> | 179 | <SubType>Code</SubType> |
180 | </Compile> | 180 | </Compile> |
181 | <Compile Include="Types\AgentCiruitData.cs"> | 181 | <Compile Include="Types\NetworkServersInfo.cs"> |
182 | <SubType>Code</SubType> | 182 | <SubType>Code</SubType> |
183 | </Compile> | 183 | </Compile> |
184 | <Compile Include="Types\Login.cs"> | 184 | <Compile Include="Types\ParcelData.cs"> |
185 | <SubType>Code</SubType> | 185 | <SubType>Code</SubType> |
186 | </Compile> | 186 | </Compile> |
187 | <Compile Include="Types\AssetLandmark.cs"> | 187 | <Compile Include="Types\PrimData.cs"> |
188 | <SubType>Code</SubType> | 188 | <SubType>Code</SubType> |
189 | </Compile> | 189 | </Compile> |
190 | <Compile Include="Types\AssetBase.cs"> | 190 | <Compile Include="Types\RegionHandle.cs"> |
191 | <SubType>Code</SubType> | 191 | <SubType>Code</SubType> |
192 | </Compile> | 192 | </Compile> |
193 | <Compile Include="Types\NetworkServersInfo.cs"> | 193 | <Compile Include="Types\RegionInfo.cs"> |
194 | <SubType>Code</SubType> | 194 | <SubType>Code</SubType> |
195 | </Compile> | 195 | </Compile> |
196 | </ItemGroup> | 196 | </ItemGroup> |
diff --git a/OpenSim/Framework/General/OpenSim.Framework.dll.build b/OpenSim/Framework/General/OpenSim.Framework.dll.build index f81737d..a18838b 100644 --- a/OpenSim/Framework/General/OpenSim.Framework.dll.build +++ b/OpenSim/Framework/General/OpenSim.Framework.dll.build | |||
@@ -12,40 +12,40 @@ | |||
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="AgentInventory.cs" /> | 14 | <include name="AgentInventory.cs" /> |
15 | <include name="Util.cs" /> | ||
16 | <include name="AuthenticateSessionBase.cs" /> | 15 | <include name="AuthenticateSessionBase.cs" /> |
17 | <include name="Logger.cs" /> | ||
18 | <include name="Remoting.cs" /> | ||
19 | <include name="RegionCommsListener.cs" /> | ||
20 | <include name="LoginService.cs" /> | ||
21 | <include name="BlockingQueue.cs" /> | 16 | <include name="BlockingQueue.cs" /> |
22 | <include name="UserProfile.cs" /> | ||
23 | <include name="IRegionCommsListener.cs" /> | 17 | <include name="IRegionCommsListener.cs" /> |
18 | <include name="Logger.cs" /> | ||
19 | <include name="LoginService.cs" /> | ||
20 | <include name="RegionCommsListener.cs" /> | ||
21 | <include name="Remoting.cs" /> | ||
24 | <include name="SimProfile.cs" /> | 22 | <include name="SimProfile.cs" /> |
23 | <include name="UserProfile.cs" /> | ||
24 | <include name="Util.cs" /> | ||
25 | <include name="Interfaces/AuthenticateResponse.cs" /> | 25 | <include name="Interfaces/AuthenticateResponse.cs" /> |
26 | <include name="Interfaces/IUserServer.cs" /> | ||
27 | <include name="Interfaces/IAssetServer.cs" /> | 26 | <include name="Interfaces/IAssetServer.cs" /> |
28 | <include name="Interfaces/IWorld.cs" /> | ||
29 | <include name="Interfaces/ILocalStorage.cs" /> | ||
30 | <include name="Interfaces/IClientAPI.cs" /> | 27 | <include name="Interfaces/IClientAPI.cs" /> |
28 | <include name="Interfaces/ILocalStorage.cs" /> | ||
29 | <include name="Interfaces/IUserServer.cs" /> | ||
30 | <include name="Interfaces/IWorld.cs" /> | ||
31 | <include name="Interfaces/Config/IGenericConfig.cs" /> | 31 | <include name="Interfaces/Config/IGenericConfig.cs" /> |
32 | <include name="Interfaces/Config/IUserConfig.cs" /> | ||
33 | <include name="Interfaces/Config/IGridConfig.cs" /> | 32 | <include name="Interfaces/Config/IGridConfig.cs" /> |
33 | <include name="Interfaces/Config/IUserConfig.cs" /> | ||
34 | <include name="Properties/AssemblyInfo.cs" /> | 34 | <include name="Properties/AssemblyInfo.cs" /> |
35 | <include name="Types/NeighbourInfo.cs" /> | 35 | <include name="Types/AgentCiruitData.cs" /> |
36 | <include name="Types/RegionHandle.cs" /> | ||
37 | <include name="Types/RegionInfo.cs" /> | ||
38 | <include name="Types/ParcelData.cs" /> | ||
39 | <include name="Types/AgentWearable.cs" /> | 36 | <include name="Types/AgentWearable.cs" /> |
40 | <include name="Types/PrimData.cs" /> | 37 | <include name="Types/AssetBase.cs" /> |
41 | <include name="Types/MapBlockData.cs" /> | 38 | <include name="Types/AssetLandmark.cs" /> |
42 | <include name="Types/AssetStorage.cs" /> | 39 | <include name="Types/AssetStorage.cs" /> |
43 | <include name="Types/EstateSettings.cs" /> | 40 | <include name="Types/EstateSettings.cs" /> |
44 | <include name="Types/AgentCiruitData.cs" /> | ||
45 | <include name="Types/Login.cs" /> | 41 | <include name="Types/Login.cs" /> |
46 | <include name="Types/AssetLandmark.cs" /> | 42 | <include name="Types/MapBlockData.cs" /> |
47 | <include name="Types/AssetBase.cs" /> | 43 | <include name="Types/NeighbourInfo.cs" /> |
48 | <include name="Types/NetworkServersInfo.cs" /> | 44 | <include name="Types/NetworkServersInfo.cs" /> |
45 | <include name="Types/ParcelData.cs" /> | ||
46 | <include name="Types/PrimData.cs" /> | ||
47 | <include name="Types/RegionHandle.cs" /> | ||
48 | <include name="Types/RegionInfo.cs" /> | ||
49 | </sources> | 49 | </sources> |
50 | <references basedir="${project::get-base-directory()}"> | 50 | <references basedir="${project::get-base-directory()}"> |
51 | <lib> | 51 | <lib> |
diff --git a/OpenSim/Framework/Servers/OpenSim.Framework.Servers.csproj b/OpenSim/Framework/Servers/OpenSim.Framework.Servers.csproj index 2301fa6..399f456 100644 --- a/OpenSim/Framework/Servers/OpenSim.Framework.Servers.csproj +++ b/OpenSim/Framework/Servers/OpenSim.Framework.Servers.csproj | |||
@@ -90,19 +90,19 @@ | |||
90 | </ProjectReference> | 90 | </ProjectReference> |
91 | </ItemGroup> | 91 | </ItemGroup> |
92 | <ItemGroup> | 92 | <ItemGroup> |
93 | <Compile Include="IRestHandler.cs"> | 93 | <Compile Include="BaseHttpServer.cs"> |
94 | <SubType>Code</SubType> | 94 | <SubType>Code</SubType> |
95 | </Compile> | 95 | </Compile> |
96 | <Compile Include="XmlRpcMethod.cs"> | 96 | <Compile Include="CheckSumServer.cs"> |
97 | <SubType>Code</SubType> | 97 | <SubType>Code</SubType> |
98 | </Compile> | 98 | </Compile> |
99 | <Compile Include="CheckSumServer.cs"> | 99 | <Compile Include="IRestHandler.cs"> |
100 | <SubType>Code</SubType> | 100 | <SubType>Code</SubType> |
101 | </Compile> | 101 | </Compile> |
102 | <Compile Include="UDPServerBase.cs"> | 102 | <Compile Include="UDPServerBase.cs"> |
103 | <SubType>Code</SubType> | 103 | <SubType>Code</SubType> |
104 | </Compile> | 104 | </Compile> |
105 | <Compile Include="BaseHttpServer.cs"> | 105 | <Compile Include="XmlRpcMethod.cs"> |
106 | <SubType>Code</SubType> | 106 | <SubType>Code</SubType> |
107 | </Compile> | 107 | </Compile> |
108 | </ItemGroup> | 108 | </ItemGroup> |
diff --git a/OpenSim/Framework/Servers/OpenSim.Framework.Servers.dll.build b/OpenSim/Framework/Servers/OpenSim.Framework.Servers.dll.build index bb20780..7401b07 100644 --- a/OpenSim/Framework/Servers/OpenSim.Framework.Servers.dll.build +++ b/OpenSim/Framework/Servers/OpenSim.Framework.Servers.dll.build | |||
@@ -11,11 +11,11 @@ | |||
11 | <resources prefix="OpenSim.Framework.Servers" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.Framework.Servers" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="IRestHandler.cs" /> | 14 | <include name="BaseHttpServer.cs" /> |
15 | <include name="XmlRpcMethod.cs" /> | ||
16 | <include name="CheckSumServer.cs" /> | 15 | <include name="CheckSumServer.cs" /> |
16 | <include name="IRestHandler.cs" /> | ||
17 | <include name="UDPServerBase.cs" /> | 17 | <include name="UDPServerBase.cs" /> |
18 | <include name="BaseHttpServer.cs" /> | 18 | <include name="XmlRpcMethod.cs" /> |
19 | </sources> | 19 | </sources> |
20 | <references basedir="${project::get-base-directory()}"> | 20 | <references basedir="${project::get-base-directory()}"> |
21 | <lib> | 21 | <lib> |
diff --git a/OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.dll.build b/OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.dll.build index 3ea339b..d2f4345 100644 --- a/OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.dll.build +++ b/OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.dll.build | |||
@@ -21,11 +21,11 @@ | |||
21 | </lib> | 21 | </lib> |
22 | <include name="../../../bin/Db4objects.Db4o.dll" /> | 22 | <include name="../../../bin/Db4objects.Db4o.dll" /> |
23 | <include name="../../../bin/libsecondlife.dll" /> | 23 | <include name="../../../bin/libsecondlife.dll" /> |
24 | <include name="../../../bin/OpenSim.Framework.dll" /> | 24 | <include name="OpenSim.Framework.dll" /> |
25 | <include name="../../../bin/OpenSim.Framework.Console.dll" /> | 25 | <include name="OpenSim.Framework.Console.dll" /> |
26 | <include name="../../../bin/OpenSim.Framework.Data.dll" /> | 26 | <include name="../../../bin/OpenSim.Framework.Data.dll" /> |
27 | <include name="../../../bin/OpenSim.Framework.GenericConfig.Xml.dll" /> | 27 | <include name="OpenSim.Framework.GenericConfig.Xml.dll" /> |
28 | <include name="../../../bin/OpenSim.Framework.Servers.dll" /> | 28 | <include name="OpenSim.Framework.Servers.dll" /> |
29 | <include name="System.dll" /> | 29 | <include name="System.dll" /> |
30 | <include name="System.Data.dll" /> | 30 | <include name="System.Data.dll" /> |
31 | <include name="System.Xml.dll" /> | 31 | <include name="System.Xml.dll" /> |
diff --git a/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.csproj b/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.csproj index 945b7a5..caebca3 100644 --- a/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.csproj +++ b/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.csproj | |||
@@ -98,10 +98,10 @@ | |||
98 | <ItemGroup> | 98 | <ItemGroup> |
99 | </ItemGroup> | 99 | </ItemGroup> |
100 | <ItemGroup> | 100 | <ItemGroup> |
101 | <Compile Include="Main.cs"> | 101 | <Compile Include="AssetHttpServer.cs"> |
102 | <SubType>Code</SubType> | 102 | <SubType>Code</SubType> |
103 | </Compile> | 103 | </Compile> |
104 | <Compile Include="AssetHttpServer.cs"> | 104 | <Compile Include="Main.cs"> |
105 | <SubType>Code</SubType> | 105 | <SubType>Code</SubType> |
106 | </Compile> | 106 | </Compile> |
107 | <Compile Include="Properties\AssemblyInfo.cs"> | 107 | <Compile Include="Properties\AssemblyInfo.cs"> |
diff --git a/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.exe.build b/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.exe.build index 0a1b533..0f9540e 100644 --- a/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.exe.build +++ b/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.exe.build | |||
@@ -11,8 +11,8 @@ | |||
11 | <resources prefix="OpenSim.Grid.AssetServer" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.Grid.AssetServer" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="Main.cs" /> | ||
15 | <include name="AssetHttpServer.cs" /> | 14 | <include name="AssetHttpServer.cs" /> |
15 | <include name="Main.cs" /> | ||
16 | <include name="Properties/AssemblyInfo.cs" /> | 16 | <include name="Properties/AssemblyInfo.cs" /> |
17 | </sources> | 17 | </sources> |
18 | <references basedir="${project::get-base-directory()}"> | 18 | <references basedir="${project::get-base-directory()}"> |
@@ -22,9 +22,9 @@ | |||
22 | </lib> | 22 | </lib> |
23 | <include name="../../../bin/Db4objects.Db4o.dll" /> | 23 | <include name="../../../bin/Db4objects.Db4o.dll" /> |
24 | <include name="../../../bin/libsecondlife.dll" /> | 24 | <include name="../../../bin/libsecondlife.dll" /> |
25 | <include name="../../../bin/OpenSim.Framework.dll" /> | 25 | <include name="OpenSim.Framework.dll" /> |
26 | <include name="../../../bin/OpenSim.Framework.Console.dll" /> | 26 | <include name="OpenSim.Framework.Console.dll" /> |
27 | <include name="../../../bin/OpenSim.Framework.Servers.dll" /> | 27 | <include name="OpenSim.Framework.Servers.dll" /> |
28 | <include name="System.dll" /> | 28 | <include name="System.dll" /> |
29 | <include name="System.Data.dll" /> | 29 | <include name="System.Data.dll" /> |
30 | <include name="System.Xml.dll" /> | 30 | <include name="System.Xml.dll" /> |
diff --git a/OpenSim/Grid/Framework.Manager/OpenSim.Grid.Framework.Manager.dll.build b/OpenSim/Grid/Framework.Manager/OpenSim.Grid.Framework.Manager.dll.build index 8e9f026..119967d 100644 --- a/OpenSim/Grid/Framework.Manager/OpenSim.Grid.Framework.Manager.dll.build +++ b/OpenSim/Grid/Framework.Manager/OpenSim.Grid.Framework.Manager.dll.build | |||
@@ -20,8 +20,8 @@ | |||
20 | <include name="${project::get-base-directory()}/${build.dir}" /> | 20 | <include name="${project::get-base-directory()}/${build.dir}" /> |
21 | </lib> | 21 | </lib> |
22 | <include name="../../../bin/libsecondlife.dll" /> | 22 | <include name="../../../bin/libsecondlife.dll" /> |
23 | <include name="../../../bin/OpenSim.Framework.dll" /> | 23 | <include name="OpenSim.Framework.dll" /> |
24 | <include name="../../../bin/OpenSim.Framework.Servers.dll" /> | 24 | <include name="OpenSim.Framework.Servers.dll" /> |
25 | <include name="System.dll" /> | 25 | <include name="System.dll" /> |
26 | <include name="../../../bin/XMLRPC.dll" /> | 26 | <include name="../../../bin/XMLRPC.dll" /> |
27 | </references> | 27 | </references> |
diff --git a/OpenSim/Grid/GridServer.Config/OpenSim.Grid.GridServer.Config.dll.build b/OpenSim/Grid/GridServer.Config/OpenSim.Grid.GridServer.Config.dll.build index cdf09e1..ff57dac 100644 --- a/OpenSim/Grid/GridServer.Config/OpenSim.Grid.GridServer.Config.dll.build +++ b/OpenSim/Grid/GridServer.Config/OpenSim.Grid.GridServer.Config.dll.build | |||
@@ -21,8 +21,8 @@ | |||
21 | </lib> | 21 | </lib> |
22 | <include name="../../../bin/Db4objects.Db4o.dll" /> | 22 | <include name="../../../bin/Db4objects.Db4o.dll" /> |
23 | <include name="../../../bin/libsecondlife.dll" /> | 23 | <include name="../../../bin/libsecondlife.dll" /> |
24 | <include name="../../../bin/OpenSim.Framework.dll" /> | 24 | <include name="OpenSim.Framework.dll" /> |
25 | <include name="../../../bin/OpenSim.Framework.Console.dll" /> | 25 | <include name="OpenSim.Framework.Console.dll" /> |
26 | <include name="System.dll" /> | 26 | <include name="System.dll" /> |
27 | <include name="System.Data.dll.dll" /> | 27 | <include name="System.Data.dll.dll" /> |
28 | <include name="System.Xml.dll" /> | 28 | <include name="System.Xml.dll" /> |
diff --git a/OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.exe.build b/OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.exe.build index 4cadf1d..3573e89 100644 --- a/OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.exe.build +++ b/OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.exe.build | |||
@@ -22,11 +22,11 @@ | |||
22 | </lib> | 22 | </lib> |
23 | <include name="../../../bin/Db4objects.Db4o.dll" /> | 23 | <include name="../../../bin/Db4objects.Db4o.dll" /> |
24 | <include name="../../../bin/libsecondlife.dll" /> | 24 | <include name="../../../bin/libsecondlife.dll" /> |
25 | <include name="../../../bin/OpenSim.Framework.dll" /> | 25 | <include name="OpenSim.Framework.dll" /> |
26 | <include name="../../../bin/OpenSim.Framework.Console.dll" /> | 26 | <include name="OpenSim.Framework.Console.dll" /> |
27 | <include name="../../../bin/OpenSim.Framework.Data.dll" /> | 27 | <include name="../../../bin/OpenSim.Framework.Data.dll" /> |
28 | <include name="../../../bin/OpenSim.Framework.GenericConfig.Xml.dll" /> | 28 | <include name="OpenSim.Framework.GenericConfig.Xml.dll" /> |
29 | <include name="../../../bin/OpenSim.Framework.Servers.dll" /> | 29 | <include name="OpenSim.Framework.Servers.dll" /> |
30 | <include name="../../../bin/OpenSim.Grid.Framework.Manager.dll" /> | 30 | <include name="../../../bin/OpenSim.Grid.Framework.Manager.dll" /> |
31 | <include name="System.dll" /> | 31 | <include name="System.dll" /> |
32 | <include name="System.Data.dll" /> | 32 | <include name="System.Data.dll" /> |
diff --git a/OpenSim/Grid/UserServer.Config/OpenSim.Grid.UserServer.Config.dll.build b/OpenSim/Grid/UserServer.Config/OpenSim.Grid.UserServer.Config.dll.build index a427765..fc7e00b 100644 --- a/OpenSim/Grid/UserServer.Config/OpenSim.Grid.UserServer.Config.dll.build +++ b/OpenSim/Grid/UserServer.Config/OpenSim.Grid.UserServer.Config.dll.build | |||
@@ -21,8 +21,8 @@ | |||
21 | </lib> | 21 | </lib> |
22 | <include name="../../../bin/Db4objects.Db4o.dll" /> | 22 | <include name="../../../bin/Db4objects.Db4o.dll" /> |
23 | <include name="../../../bin/libsecondlife.dll" /> | 23 | <include name="../../../bin/libsecondlife.dll" /> |
24 | <include name="../../../bin/OpenSim.Framework.dll" /> | 24 | <include name="OpenSim.Framework.dll" /> |
25 | <include name="../../../bin/OpenSim.Framework.Console.dll" /> | 25 | <include name="OpenSim.Framework.Console.dll" /> |
26 | <include name="System.dll" /> | 26 | <include name="System.dll" /> |
27 | <include name="System.Data.dll.dll" /> | 27 | <include name="System.Data.dll.dll" /> |
28 | <include name="System.Xml.dll" /> | 28 | <include name="System.Xml.dll" /> |
diff --git a/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.csproj b/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.csproj index e822c18..1146b17 100644 --- a/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.csproj +++ b/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.csproj | |||
@@ -114,10 +114,10 @@ | |||
114 | </ProjectReference> | 114 | </ProjectReference> |
115 | </ItemGroup> | 115 | </ItemGroup> |
116 | <ItemGroup> | 116 | <ItemGroup> |
117 | <Compile Include="UserManager.cs"> | 117 | <Compile Include="Main.cs"> |
118 | <SubType>Code</SubType> | 118 | <SubType>Code</SubType> |
119 | </Compile> | 119 | </Compile> |
120 | <Compile Include="Main.cs"> | 120 | <Compile Include="UserManager.cs"> |
121 | <SubType>Code</SubType> | 121 | <SubType>Code</SubType> |
122 | </Compile> | 122 | </Compile> |
123 | <Compile Include="Properties\AssemblyInfo.cs"> | 123 | <Compile Include="Properties\AssemblyInfo.cs"> |
diff --git a/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.exe.build b/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.exe.build index b0333f1..8bc1fc1 100644 --- a/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.exe.build +++ b/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.exe.build | |||
@@ -11,8 +11,8 @@ | |||
11 | <resources prefix="OpenSim.Grid.UserServer" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.Grid.UserServer" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="UserManager.cs" /> | ||
15 | <include name="Main.cs" /> | 14 | <include name="Main.cs" /> |
15 | <include name="UserManager.cs" /> | ||
16 | <include name="Properties/AssemblyInfo.cs" /> | 16 | <include name="Properties/AssemblyInfo.cs" /> |
17 | </sources> | 17 | </sources> |
18 | <references basedir="${project::get-base-directory()}"> | 18 | <references basedir="${project::get-base-directory()}"> |
@@ -22,11 +22,11 @@ | |||
22 | </lib> | 22 | </lib> |
23 | <include name="../../../bin/Db4objects.Db4o.dll" /> | 23 | <include name="../../../bin/Db4objects.Db4o.dll" /> |
24 | <include name="../../../bin/libsecondlife.dll" /> | 24 | <include name="../../../bin/libsecondlife.dll" /> |
25 | <include name="../../../bin/OpenSim.Framework.dll" /> | 25 | <include name="OpenSim.Framework.dll" /> |
26 | <include name="../../../bin/OpenSim.Framework.Console.dll" /> | 26 | <include name="OpenSim.Framework.Console.dll" /> |
27 | <include name="../../../bin/OpenSim.Framework.Data.dll" /> | 27 | <include name="../../../bin/OpenSim.Framework.Data.dll" /> |
28 | <include name="../../../bin/OpenSim.Framework.GenericConfig.Xml.dll" /> | 28 | <include name="OpenSim.Framework.GenericConfig.Xml.dll" /> |
29 | <include name="../../../bin/OpenSim.Framework.Servers.dll" /> | 29 | <include name="OpenSim.Framework.Servers.dll" /> |
30 | <include name="../../../bin/OpenSim.Framework.UserManagement.dll" /> | 30 | <include name="../../../bin/OpenSim.Framework.UserManagement.dll" /> |
31 | <include name="System.dll" /> | 31 | <include name="System.dll" /> |
32 | <include name="System.Data.dll" /> | 32 | <include name="System.Data.dll" /> |
diff --git a/OpenSim/Region/Application/OpenSim.csproj b/OpenSim/Region/Application/OpenSim.csproj index f5da23d..bec85cc 100644 --- a/OpenSim/Region/Application/OpenSim.csproj +++ b/OpenSim/Region/Application/OpenSim.csproj | |||
@@ -170,15 +170,15 @@ | |||
170 | </ProjectReference> | 170 | </ProjectReference> |
171 | </ItemGroup> | 171 | </ItemGroup> |
172 | <ItemGroup> | 172 | <ItemGroup> |
173 | <Compile Include="VersionInfo.cs"> | ||
174 | <SubType>Code</SubType> | ||
175 | </Compile> | ||
176 | <Compile Include="Application.cs"> | 173 | <Compile Include="Application.cs"> |
177 | <SubType>Code</SubType> | 174 | <SubType>Code</SubType> |
178 | </Compile> | 175 | </Compile> |
179 | <Compile Include="OpenSimMain.cs"> | 176 | <Compile Include="OpenSimMain.cs"> |
180 | <SubType>Code</SubType> | 177 | <SubType>Code</SubType> |
181 | </Compile> | 178 | </Compile> |
179 | <Compile Include="VersionInfo.cs"> | ||
180 | <SubType>Code</SubType> | ||
181 | </Compile> | ||
182 | </ItemGroup> | 182 | </ItemGroup> |
183 | <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> | 183 | <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> |
184 | <PropertyGroup> | 184 | <PropertyGroup> |
diff --git a/OpenSim/Region/Application/OpenSim.exe.build b/OpenSim/Region/Application/OpenSim.exe.build index 9890cfa..6c7d7ac 100644 --- a/OpenSim/Region/Application/OpenSim.exe.build +++ b/OpenSim/Region/Application/OpenSim.exe.build | |||
@@ -11,9 +11,9 @@ | |||
11 | <resources prefix="OpenSim" dynamicprefix="true" > | 11 | <resources prefix="OpenSim" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="VersionInfo.cs" /> | ||
15 | <include name="Application.cs" /> | 14 | <include name="Application.cs" /> |
16 | <include name="OpenSimMain.cs" /> | 15 | <include name="OpenSimMain.cs" /> |
16 | <include name="VersionInfo.cs" /> | ||
17 | </sources> | 17 | </sources> |
18 | <references basedir="${project::get-base-directory()}"> | 18 | <references basedir="${project::get-base-directory()}"> |
19 | <lib> | 19 | <lib> |
diff --git a/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj b/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj index bb21365..4667d52 100644 --- a/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj +++ b/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj | |||
@@ -96,40 +96,40 @@ | |||
96 | </ProjectReference> | 96 | </ProjectReference> |
97 | </ItemGroup> | 97 | </ItemGroup> |
98 | <ItemGroup> | 98 | <ItemGroup> |
99 | <Compile Include="LLSDCapsDetails.cs"> | 99 | <Compile Include="Caps.cs"> |
100 | <SubType>Code</SubType> | 100 | <SubType>Code</SubType> |
101 | </Compile> | 101 | </Compile> |
102 | <Compile Include="LLSDArray.cs"> | 102 | <Compile Include="LLSDArray.cs"> |
103 | <SubType>Code</SubType> | 103 | <SubType>Code</SubType> |
104 | </Compile> | 104 | </Compile> |
105 | <Compile Include="LLSDEmpty.cs"> | 105 | <Compile Include="LLSDCapEvent.cs"> |
106 | <SubType>Code</SubType> | 106 | <SubType>Code</SubType> |
107 | </Compile> | 107 | </Compile> |
108 | <Compile Include="LLSDTest.cs"> | 108 | <Compile Include="LLSDCapsDetails.cs"> |
109 | <SubType>Code</SubType> | 109 | <SubType>Code</SubType> |
110 | </Compile> | 110 | </Compile> |
111 | <Compile Include="LLSDUploadReply.cs"> | 111 | <Compile Include="LLSDEmpty.cs"> |
112 | <SubType>Code</SubType> | 112 | <SubType>Code</SubType> |
113 | </Compile> | 113 | </Compile> |
114 | <Compile Include="LLSDType.cs"> | 114 | <Compile Include="LLSDHelpers.cs"> |
115 | <SubType>Code</SubType> | 115 | <SubType>Code</SubType> |
116 | </Compile> | 116 | </Compile> |
117 | <Compile Include="LLSDCapEvent.cs"> | 117 | <Compile Include="LLSDMapLayer.cs"> |
118 | <SubType>Code</SubType> | 118 | <SubType>Code</SubType> |
119 | </Compile> | 119 | </Compile> |
120 | <Compile Include="LLSDMapRequest.cs"> | 120 | <Compile Include="LLSDMapLayerResponse.cs"> |
121 | <SubType>Code</SubType> | 121 | <SubType>Code</SubType> |
122 | </Compile> | 122 | </Compile> |
123 | <Compile Include="Caps.cs"> | 123 | <Compile Include="LLSDMapRequest.cs"> |
124 | <SubType>Code</SubType> | 124 | <SubType>Code</SubType> |
125 | </Compile> | 125 | </Compile> |
126 | <Compile Include="LLSDMapLayerResponse.cs"> | 126 | <Compile Include="LLSDTest.cs"> |
127 | <SubType>Code</SubType> | 127 | <SubType>Code</SubType> |
128 | </Compile> | 128 | </Compile> |
129 | <Compile Include="LLSDMapLayer.cs"> | 129 | <Compile Include="LLSDType.cs"> |
130 | <SubType>Code</SubType> | 130 | <SubType>Code</SubType> |
131 | </Compile> | 131 | </Compile> |
132 | <Compile Include="LLSDHelpers.cs"> | 132 | <Compile Include="LLSDUploadReply.cs"> |
133 | <SubType>Code</SubType> | 133 | <SubType>Code</SubType> |
134 | </Compile> | 134 | </Compile> |
135 | </ItemGroup> | 135 | </ItemGroup> |
diff --git a/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.dll.build b/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.dll.build index 817e5b0..a091b5c 100644 --- a/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.dll.build +++ b/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.dll.build | |||
@@ -11,18 +11,18 @@ | |||
11 | <resources prefix="OpenSim.Region.Capabilities" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.Region.Capabilities" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="LLSDCapsDetails.cs" /> | 14 | <include name="Caps.cs" /> |
15 | <include name="LLSDArray.cs" /> | 15 | <include name="LLSDArray.cs" /> |
16 | <include name="LLSDCapEvent.cs" /> | ||
17 | <include name="LLSDCapsDetails.cs" /> | ||
16 | <include name="LLSDEmpty.cs" /> | 18 | <include name="LLSDEmpty.cs" /> |
19 | <include name="LLSDHelpers.cs" /> | ||
20 | <include name="LLSDMapLayer.cs" /> | ||
21 | <include name="LLSDMapLayerResponse.cs" /> | ||
22 | <include name="LLSDMapRequest.cs" /> | ||
17 | <include name="LLSDTest.cs" /> | 23 | <include name="LLSDTest.cs" /> |
18 | <include name="LLSDUploadReply.cs" /> | ||
19 | <include name="LLSDType.cs" /> | 24 | <include name="LLSDType.cs" /> |
20 | <include name="LLSDCapEvent.cs" /> | 25 | <include name="LLSDUploadReply.cs" /> |
21 | <include name="LLSDMapRequest.cs" /> | ||
22 | <include name="Caps.cs" /> | ||
23 | <include name="LLSDMapLayerResponse.cs" /> | ||
24 | <include name="LLSDMapLayer.cs" /> | ||
25 | <include name="LLSDHelpers.cs" /> | ||
26 | </sources> | 26 | </sources> |
27 | <references basedir="${project::get-base-directory()}"> | 27 | <references basedir="${project::get-base-directory()}"> |
28 | <lib> | 28 | <lib> |
diff --git a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj index e679174..3093eb0 100644 --- a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj +++ b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj | |||
@@ -122,34 +122,34 @@ | |||
122 | </ProjectReference> | 122 | </ProjectReference> |
123 | </ItemGroup> | 123 | </ItemGroup> |
124 | <ItemGroup> | 124 | <ItemGroup> |
125 | <Compile Include="ClientView.AgentAssetUpload.cs"> | 125 | <Compile Include="ClientStackNetworkHandler.cs"> |
126 | <SubType>Code</SubType> | 126 | <SubType>Code</SubType> |
127 | </Compile> | 127 | </Compile> |
128 | <Compile Include="ClientStackNetworkHandler.cs"> | 128 | <Compile Include="ClientView.AgentAssetUpload.cs"> |
129 | <SubType>Code</SubType> | 129 | <SubType>Code</SubType> |
130 | </Compile> | 130 | </Compile> |
131 | <Compile Include="PacketServer.cs"> | 131 | <Compile Include="ClientView.API.cs"> |
132 | <SubType>Code</SubType> | 132 | <SubType>Code</SubType> |
133 | </Compile> | 133 | </Compile> |
134 | <Compile Include="UDPServer.cs"> | 134 | <Compile Include="ClientView.cs"> |
135 | <SubType>Code</SubType> | 135 | <SubType>Code</SubType> |
136 | </Compile> | 136 | </Compile> |
137 | <Compile Include="ClientViewBase.cs"> | 137 | <Compile Include="ClientView.PacketHandlers.cs"> |
138 | <SubType>Code</SubType> | 138 | <SubType>Code</SubType> |
139 | </Compile> | 139 | </Compile> |
140 | <Compile Include="ClientView.cs"> | 140 | <Compile Include="ClientView.ProcessPackets.cs"> |
141 | <SubType>Code</SubType> | 141 | <SubType>Code</SubType> |
142 | </Compile> | 142 | </Compile> |
143 | <Compile Include="ClientView.PacketHandlers.cs"> | 143 | <Compile Include="ClientViewBase.cs"> |
144 | <SubType>Code</SubType> | 144 | <SubType>Code</SubType> |
145 | </Compile> | 145 | </Compile> |
146 | <Compile Include="RegionApplicationBase.cs"> | 146 | <Compile Include="PacketServer.cs"> |
147 | <SubType>Code</SubType> | 147 | <SubType>Code</SubType> |
148 | </Compile> | 148 | </Compile> |
149 | <Compile Include="ClientView.API.cs"> | 149 | <Compile Include="RegionApplicationBase.cs"> |
150 | <SubType>Code</SubType> | 150 | <SubType>Code</SubType> |
151 | </Compile> | 151 | </Compile> |
152 | <Compile Include="ClientView.ProcessPackets.cs"> | 152 | <Compile Include="UDPServer.cs"> |
153 | <SubType>Code</SubType> | 153 | <SubType>Code</SubType> |
154 | </Compile> | 154 | </Compile> |
155 | <Compile Include="Assets\InventoryCache.cs"> | 155 | <Compile Include="Assets\InventoryCache.cs"> |
diff --git a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build index 95422c8..f76a4c8 100644 --- a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build +++ b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build | |||
@@ -11,16 +11,16 @@ | |||
11 | <resources prefix="OpenSim.Region.ClientStack" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.Region.ClientStack" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="ClientView.AgentAssetUpload.cs" /> | ||
15 | <include name="ClientStackNetworkHandler.cs" /> | 14 | <include name="ClientStackNetworkHandler.cs" /> |
16 | <include name="PacketServer.cs" /> | 15 | <include name="ClientView.AgentAssetUpload.cs" /> |
17 | <include name="UDPServer.cs" /> | 16 | <include name="ClientView.API.cs" /> |
18 | <include name="ClientViewBase.cs" /> | ||
19 | <include name="ClientView.cs" /> | 17 | <include name="ClientView.cs" /> |
20 | <include name="ClientView.PacketHandlers.cs" /> | 18 | <include name="ClientView.PacketHandlers.cs" /> |
21 | <include name="RegionApplicationBase.cs" /> | ||
22 | <include name="ClientView.API.cs" /> | ||
23 | <include name="ClientView.ProcessPackets.cs" /> | 19 | <include name="ClientView.ProcessPackets.cs" /> |
20 | <include name="ClientViewBase.cs" /> | ||
21 | <include name="PacketServer.cs" /> | ||
22 | <include name="RegionApplicationBase.cs" /> | ||
23 | <include name="UDPServer.cs" /> | ||
24 | <include name="Assets/InventoryCache.cs" /> | 24 | <include name="Assets/InventoryCache.cs" /> |
25 | </sources> | 25 | </sources> |
26 | <references basedir="${project::get-base-directory()}"> | 26 | <references basedir="${project::get-base-directory()}"> |
diff --git a/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj index 200fa3a..0a15a49 100644 --- a/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj +++ b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj | |||
@@ -98,13 +98,13 @@ | |||
98 | </ProjectReference> | 98 | </ProjectReference> |
99 | </ItemGroup> | 99 | </ItemGroup> |
100 | <ItemGroup> | 100 | <ItemGroup> |
101 | <Compile Include="LocalBackEndServices.cs"> | 101 | <Compile Include="CommunicationsLocal.cs"> |
102 | <SubType>Code</SubType> | 102 | <SubType>Code</SubType> |
103 | </Compile> | 103 | </Compile> |
104 | <Compile Include="LocalUserServices.cs"> | 104 | <Compile Include="LocalBackEndServices.cs"> |
105 | <SubType>Code</SubType> | 105 | <SubType>Code</SubType> |
106 | </Compile> | 106 | </Compile> |
107 | <Compile Include="CommunicationsLocal.cs"> | 107 | <Compile Include="LocalUserServices.cs"> |
108 | <SubType>Code</SubType> | 108 | <SubType>Code</SubType> |
109 | </Compile> | 109 | </Compile> |
110 | <Compile Include="Properties\AssemblyInfo.cs"> | 110 | <Compile Include="Properties\AssemblyInfo.cs"> |
diff --git a/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.dll.build b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.dll.build index 60a90bd..3cac9d3 100644 --- a/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.dll.build +++ b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.dll.build | |||
@@ -11,9 +11,9 @@ | |||
11 | <resources prefix="OpenSim.Region.Communications.Local" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.Region.Communications.Local" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="CommunicationsLocal.cs" /> | ||
14 | <include name="LocalBackEndServices.cs" /> | 15 | <include name="LocalBackEndServices.cs" /> |
15 | <include name="LocalUserServices.cs" /> | 16 | <include name="LocalUserServices.cs" /> |
16 | <include name="CommunicationsLocal.cs" /> | ||
17 | <include name="Properties/AssemblyInfo.cs" /> | 17 | <include name="Properties/AssemblyInfo.cs" /> |
18 | </sources> | 18 | </sources> |
19 | <references basedir="${project::get-base-directory()}"> | 19 | <references basedir="${project::get-base-directory()}"> |
diff --git a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj index 0a9e5fb..d6abd13 100644 --- a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj +++ b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj | |||
@@ -116,13 +116,13 @@ | |||
116 | </ProjectReference> | 116 | </ProjectReference> |
117 | </ItemGroup> | 117 | </ItemGroup> |
118 | <ItemGroup> | 118 | <ItemGroup> |
119 | <Compile Include="OGS1InterSimComms.cs"> | 119 | <Compile Include="CommunicationsOGS1.cs"> |
120 | <SubType>Code</SubType> | 120 | <SubType>Code</SubType> |
121 | </Compile> | 121 | </Compile> |
122 | <Compile Include="OGS1GridServices.cs"> | 122 | <Compile Include="OGS1GridServices.cs"> |
123 | <SubType>Code</SubType> | 123 | <SubType>Code</SubType> |
124 | </Compile> | 124 | </Compile> |
125 | <Compile Include="CommunicationsOGS1.cs"> | 125 | <Compile Include="OGS1InterSimComms.cs"> |
126 | <SubType>Code</SubType> | 126 | <SubType>Code</SubType> |
127 | </Compile> | 127 | </Compile> |
128 | <Compile Include="OGS1UserServices.cs"> | 128 | <Compile Include="OGS1UserServices.cs"> |
diff --git a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build index 2176b14..04d61b9 100644 --- a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build +++ b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build | |||
@@ -11,9 +11,9 @@ | |||
11 | <resources prefix="OpenSim.Region.Communications.OGS1" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.Region.Communications.OGS1" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="OGS1InterSimComms.cs" /> | ||
15 | <include name="OGS1GridServices.cs" /> | ||
16 | <include name="CommunicationsOGS1.cs" /> | 14 | <include name="CommunicationsOGS1.cs" /> |
15 | <include name="OGS1GridServices.cs" /> | ||
16 | <include name="OGS1InterSimComms.cs" /> | ||
17 | <include name="OGS1UserServices.cs" /> | 17 | <include name="OGS1UserServices.cs" /> |
18 | <include name="Properties/AssemblyInfo.cs" /> | 18 | <include name="Properties/AssemblyInfo.cs" /> |
19 | </sources> | 19 | </sources> |
diff --git a/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj b/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj index 0cfeda9..428f381 100644 --- a/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj +++ b/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj | |||
@@ -82,10 +82,6 @@ | |||
82 | <HintPath>System.Xml.dll</HintPath> | 82 | <HintPath>System.Xml.dll</HintPath> |
83 | <Private>False</Private> | 83 | <Private>False</Private> |
84 | </Reference> | 84 | </Reference> |
85 | <Reference Include="VJSharpCodeProvider" > | ||
86 | <HintPath>VJSharpCodeProvider.dll</HintPath> | ||
87 | <Private>False</Private> | ||
88 | </Reference> | ||
89 | <Reference Include="XMLRPC.dll" > | 85 | <Reference Include="XMLRPC.dll" > |
90 | <HintPath>..\..\..\bin\XMLRPC.dll</HintPath> | 86 | <HintPath>..\..\..\bin\XMLRPC.dll</HintPath> |
91 | <Private>False</Private> | 87 | <Private>False</Private> |
@@ -148,61 +144,58 @@ | |||
148 | </ProjectReference> | 144 | </ProjectReference> |
149 | </ItemGroup> | 145 | </ItemGroup> |
150 | <ItemGroup> | 146 | <ItemGroup> |
151 | <Compile Include="RegionManager.cs"> | ||
152 | <SubType>Code</SubType> | ||
153 | </Compile> | ||
154 | <Compile Include="EstateManager.cs"> | 147 | <Compile Include="EstateManager.cs"> |
155 | <SubType>Code</SubType> | 148 | <SubType>Code</SubType> |
156 | </Compile> | 149 | </Compile> |
157 | <Compile Include="ParcelManager.cs"> | 150 | <Compile Include="ParcelManager.cs"> |
158 | <SubType>Code</SubType> | 151 | <SubType>Code</SubType> |
159 | </Compile> | 152 | </Compile> |
160 | <Compile Include="Scenes\ScenePresence.Body.cs"> | 153 | <Compile Include="RegionManager.cs"> |
161 | <SubType>Code</SubType> | 154 | <SubType>Code</SubType> |
162 | </Compile> | 155 | </Compile> |
163 | <Compile Include="Scenes\SceneEvents.cs"> | 156 | <Compile Include="Scenes\Entity.cs"> |
164 | <SubType>Code</SubType> | 157 | <SubType>Code</SubType> |
165 | </Compile> | 158 | </Compile> |
166 | <Compile Include="Scenes\ScenePresence.Animations.cs"> | 159 | <Compile Include="Scenes\IScenePresenceBody.cs"> |
167 | <SubType>Code</SubType> | 160 | <SubType>Code</SubType> |
168 | </Compile> | 161 | </Compile> |
169 | <Compile Include="Scenes\Scene.PacketHandlers.cs"> | 162 | <Compile Include="Scenes\Primitive.cs"> |
170 | <SubType>Code</SubType> | 163 | <SubType>Code</SubType> |
171 | </Compile> | 164 | </Compile> |
172 | <Compile Include="Scenes\SceneObject.cs"> | 165 | <Compile Include="Scenes\Scene.cs"> |
173 | <SubType>Code</SubType> | 166 | <SubType>Code</SubType> |
174 | </Compile> | 167 | </Compile> |
175 | <Compile Include="Scenes\Primitive.cs"> | 168 | <Compile Include="Scenes\Scene.PacketHandlers.cs"> |
176 | <SubType>Code</SubType> | 169 | <SubType>Code</SubType> |
177 | </Compile> | 170 | </Compile> |
178 | <Compile Include="Scenes\IScenePresenceBody.cs"> | 171 | <Compile Include="Scenes\SceneBase.cs"> |
179 | <SubType>Code</SubType> | 172 | <SubType>Code</SubType> |
180 | </Compile> | 173 | </Compile> |
181 | <Compile Include="Scenes\Entity.cs"> | 174 | <Compile Include="Scenes\SceneEvents.cs"> |
182 | <SubType>Code</SubType> | 175 | <SubType>Code</SubType> |
183 | </Compile> | 176 | </Compile> |
184 | <Compile Include="Scenes\SceneBase.cs"> | 177 | <Compile Include="Scenes\SceneObject.cs"> |
185 | <SubType>Code</SubType> | 178 | <SubType>Code</SubType> |
186 | </Compile> | 179 | </Compile> |
187 | <Compile Include="Scenes\ScenePresence.cs"> | 180 | <Compile Include="Scenes\ScenePresence.Animations.cs"> |
188 | <SubType>Code</SubType> | 181 | <SubType>Code</SubType> |
189 | </Compile> | 182 | </Compile> |
190 | <Compile Include="Scenes\Scene.cs"> | 183 | <Compile Include="Scenes\ScenePresence.Body.cs"> |
191 | <SubType>Code</SubType> | 184 | <SubType>Code</SubType> |
192 | </Compile> | 185 | </Compile> |
193 | <Compile Include="Scenes\scripting\ScriptManager.cs"> | 186 | <Compile Include="Scenes\ScenePresence.cs"> |
194 | <SubType>Code</SubType> | 187 | <SubType>Code</SubType> |
195 | </Compile> | 188 | </Compile> |
196 | <Compile Include="Scenes\scripting\ScriptInfo.cs"> | 189 | <Compile Include="Scenes\scripting\Script.cs"> |
197 | <SubType>Code</SubType> | 190 | <SubType>Code</SubType> |
198 | </Compile> | 191 | </Compile> |
199 | <Compile Include="Scenes\scripting\Script.cs"> | 192 | <Compile Include="Scenes\scripting\ScriptInfo.cs"> |
200 | <SubType>Code</SubType> | 193 | <SubType>Code</SubType> |
201 | </Compile> | 194 | </Compile> |
202 | <Compile Include="Scenes\scripting\Engines\CSharpScriptEngine.cs"> | 195 | <Compile Include="Scenes\scripting\ScriptManager.cs"> |
203 | <SubType>Code</SubType> | 196 | <SubType>Code</SubType> |
204 | </Compile> | 197 | </Compile> |
205 | <Compile Include="Scenes\scripting\Engines\JSharpScriptEngine.cs"> | 198 | <Compile Include="Scenes\scripting\Engines\CSharpScriptEngine.cs"> |
206 | <SubType>Code</SubType> | 199 | <SubType>Code</SubType> |
207 | </Compile> | 200 | </Compile> |
208 | <Compile Include="Scenes\scripting\Engines\JScriptEngine.cs"> | 201 | <Compile Include="Scenes\scripting\Engines\JScriptEngine.cs"> |
diff --git a/OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build b/OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build index fcfc623..2fa5e76 100644 --- a/OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build +++ b/OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build | |||
@@ -11,25 +11,24 @@ | |||
11 | <resources prefix="OpenSim.Region.Environment" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.Region.Environment" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="RegionManager.cs" /> | ||
15 | <include name="EstateManager.cs" /> | 14 | <include name="EstateManager.cs" /> |
16 | <include name="ParcelManager.cs" /> | 15 | <include name="ParcelManager.cs" /> |
17 | <include name="Scenes/ScenePresence.Body.cs" /> | 16 | <include name="RegionManager.cs" /> |
18 | <include name="Scenes/SceneEvents.cs" /> | ||
19 | <include name="Scenes/ScenePresence.Animations.cs" /> | ||
20 | <include name="Scenes/Scene.PacketHandlers.cs" /> | ||
21 | <include name="Scenes/SceneObject.cs" /> | ||
22 | <include name="Scenes/Primitive.cs" /> | ||
23 | <include name="Scenes/IScenePresenceBody.cs" /> | ||
24 | <include name="Scenes/Entity.cs" /> | 17 | <include name="Scenes/Entity.cs" /> |
18 | <include name="Scenes/IScenePresenceBody.cs" /> | ||
19 | <include name="Scenes/Primitive.cs" /> | ||
20 | <include name="Scenes/Scene.cs" /> | ||
21 | <include name="Scenes/Scene.PacketHandlers.cs" /> | ||
25 | <include name="Scenes/SceneBase.cs" /> | 22 | <include name="Scenes/SceneBase.cs" /> |
23 | <include name="Scenes/SceneEvents.cs" /> | ||
24 | <include name="Scenes/SceneObject.cs" /> | ||
25 | <include name="Scenes/ScenePresence.Animations.cs" /> | ||
26 | <include name="Scenes/ScenePresence.Body.cs" /> | ||
26 | <include name="Scenes/ScenePresence.cs" /> | 27 | <include name="Scenes/ScenePresence.cs" /> |
27 | <include name="Scenes/Scene.cs" /> | ||
28 | <include name="Scenes/scripting/ScriptManager.cs" /> | ||
29 | <include name="Scenes/scripting/ScriptInfo.cs" /> | ||
30 | <include name="Scenes/scripting/Script.cs" /> | 28 | <include name="Scenes/scripting/Script.cs" /> |
29 | <include name="Scenes/scripting/ScriptInfo.cs" /> | ||
30 | <include name="Scenes/scripting/ScriptManager.cs" /> | ||
31 | <include name="Scenes/scripting/Engines/CSharpScriptEngine.cs" /> | 31 | <include name="Scenes/scripting/Engines/CSharpScriptEngine.cs" /> |
32 | <include name="Scenes/scripting/Engines/JSharpScriptEngine.cs" /> | ||
33 | <include name="Scenes/scripting/Engines/JScriptEngine.cs" /> | 32 | <include name="Scenes/scripting/Engines/JScriptEngine.cs" /> |
34 | </sources> | 33 | </sources> |
35 | <references basedir="${project::get-base-directory()}"> | 34 | <references basedir="${project::get-base-directory()}"> |
@@ -52,7 +51,6 @@ | |||
52 | <include name="../../../bin/OpenSim.Region.Terrain.BasicTerrain.dll" /> | 51 | <include name="../../../bin/OpenSim.Region.Terrain.BasicTerrain.dll" /> |
53 | <include name="System.dll" /> | 52 | <include name="System.dll" /> |
54 | <include name="System.Xml.dll" /> | 53 | <include name="System.Xml.dll" /> |
55 | <include name="VJSharpCodeProvider.dll" /> | ||
56 | <include name="../../../bin/XMLRPC.dll" /> | 54 | <include name="../../../bin/XMLRPC.dll" /> |
57 | </references> | 55 | </references> |
58 | </csc> | 56 | </csc> |
diff --git a/OpenSim/Region/Environment/Scenes/scripting/Engines/JSharpScriptEngine.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/JSharpScriptEngine.cs deleted file mode 100644 index 51b1512..0000000 --- a/OpenSim/Region/Environment/Scenes/scripting/Engines/JSharpScriptEngine.cs +++ /dev/null | |||
@@ -1,104 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://www.openmetaverse.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSim Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | * | ||
27 | */ | ||
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.Text; | ||
31 | |||
32 | // Compilation stuff | ||
33 | using System.CodeDom; | ||
34 | using System.CodeDom.Compiler; | ||
35 | using Microsoft.VJSharp; | ||
36 | |||
37 | namespace OpenSim.Region.Enviorment.Scripting | ||
38 | { | ||
39 | public class JSharpScriptEngine : IScriptCompiler | ||
40 | { | ||
41 | public string FileExt() | ||
42 | { | ||
43 | return ".jsl"; | ||
44 | } | ||
45 | |||
46 | private Dictionary<string, IScript> LoadDotNetScript(ICodeCompiler compiler, string filename) | ||
47 | { | ||
48 | CompilerParameters compilerParams = new CompilerParameters(); | ||
49 | CompilerResults compilerResults; | ||
50 | compilerParams.GenerateExecutable = false; | ||
51 | compilerParams.GenerateInMemory = true; | ||
52 | compilerParams.IncludeDebugInformation = false; | ||
53 | compilerParams.ReferencedAssemblies.Add("OpenSim.Region.dll"); | ||
54 | compilerParams.ReferencedAssemblies.Add("OpenSim.Framework.dll"); | ||
55 | compilerParams.ReferencedAssemblies.Add("libsecondlife.dll"); | ||
56 | compilerParams.ReferencedAssemblies.Add("System.dll"); | ||
57 | |||
58 | compilerResults = compiler.CompileAssemblyFromFile(compilerParams, filename); | ||
59 | |||
60 | if (compilerResults.Errors.Count > 0) | ||
61 | { | ||
62 | OpenSim.Framework.Console.MainLog.Instance.Error("Compile errors"); | ||
63 | foreach (CompilerError error in compilerResults.Errors) | ||
64 | { | ||
65 | OpenSim.Framework.Console.MainLog.Instance.Error(error.Line.ToString() + ": " + error.ErrorText.ToString()); | ||
66 | } | ||
67 | } | ||
68 | else | ||
69 | { | ||
70 | Dictionary<string, IScript> scripts = new Dictionary<string, IScript>(); | ||
71 | |||
72 | foreach (Type pluginType in compilerResults.CompiledAssembly.GetExportedTypes()) | ||
73 | { | ||
74 | Type testInterface = pluginType.GetInterface("IScript", true); | ||
75 | |||
76 | if (testInterface != null) | ||
77 | { | ||
78 | IScript script = (IScript)compilerResults.CompiledAssembly.CreateInstance(pluginType.ToString()); | ||
79 | |||
80 | string scriptName = "J#/" + script.getName(); | ||
81 | Console.WriteLine("Script: " + scriptName + " loaded."); | ||
82 | |||
83 | if (!scripts.ContainsKey(scriptName)) | ||
84 | { | ||
85 | scripts.Add(scriptName, script); | ||
86 | } | ||
87 | else | ||
88 | { | ||
89 | scripts[scriptName] = script; | ||
90 | } | ||
91 | } | ||
92 | } | ||
93 | return scripts; | ||
94 | } | ||
95 | return null; | ||
96 | } | ||
97 | |||
98 | public Dictionary<string, IScript> compile(string filename) | ||
99 | { | ||
100 | VJSharpCodeProvider jsharpProvider = new VJSharpCodeProvider(); | ||
101 | return LoadDotNetScript(jsharpProvider.CreateCompiler(), filename); | ||
102 | } | ||
103 | } | ||
104 | } | ||
diff --git a/OpenSim/Region/Environment/Scenes/scripting/ScriptManager.cs b/OpenSim/Region/Environment/Scenes/scripting/ScriptManager.cs index 576b7a5..eb1c1d9 100644 --- a/OpenSim/Region/Environment/Scenes/scripting/ScriptManager.cs +++ b/OpenSim/Region/Environment/Scenes/scripting/ScriptManager.cs | |||
@@ -59,9 +59,6 @@ namespace OpenSim.Region.Enviorment.Scripting | |||
59 | 59 | ||
60 | JScriptEngine jscriptCompiler = new JScriptEngine(); | 60 | JScriptEngine jscriptCompiler = new JScriptEngine(); |
61 | compilers.Add(jscriptCompiler.FileExt(), jscriptCompiler); | 61 | compilers.Add(jscriptCompiler.FileExt(), jscriptCompiler); |
62 | |||
63 | JSharpScriptEngine jsharpCompiler = new JSharpScriptEngine(); | ||
64 | compilers.Add(jsharpCompiler.FileExt(), jsharpCompiler); | ||
65 | } | 62 | } |
66 | 63 | ||
67 | public void Compile(string filename) | 64 | public void Compile(string filename) |
diff --git a/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj b/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj index 716fd57..147158c 100644 --- a/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj +++ b/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj | |||
@@ -93,6 +93,9 @@ | |||
93 | <Compile Include="AssemblyInfo.cs"> | 93 | <Compile Include="AssemblyInfo.cs"> |
94 | <SubType>Code</SubType> | 94 | <SubType>Code</SubType> |
95 | </Compile> | 95 | </Compile> |
96 | <Compile Include="Db4LocalStorage.cs"> | ||
97 | <SubType>Code</SubType> | ||
98 | </Compile> | ||
96 | <Compile Include="MapStorage.cs"> | 99 | <Compile Include="MapStorage.cs"> |
97 | <SubType>Code</SubType> | 100 | <SubType>Code</SubType> |
98 | </Compile> | 101 | </Compile> |
@@ -102,9 +105,6 @@ | |||
102 | <Compile Include="UUIDPrimQuery.cs"> | 105 | <Compile Include="UUIDPrimQuery.cs"> |
103 | <SubType>Code</SubType> | 106 | <SubType>Code</SubType> |
104 | </Compile> | 107 | </Compile> |
105 | <Compile Include="Db4LocalStorage.cs"> | ||
106 | <SubType>Code</SubType> | ||
107 | </Compile> | ||
108 | </ItemGroup> | 108 | </ItemGroup> |
109 | <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> | 109 | <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> |
110 | <PropertyGroup> | 110 | <PropertyGroup> |
diff --git a/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.dll.build b/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.dll.build index 112ff1c..fc9f055 100644 --- a/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.dll.build +++ b/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.dll.build | |||
@@ -12,10 +12,10 @@ | |||
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="AssemblyInfo.cs" /> | 14 | <include name="AssemblyInfo.cs" /> |
15 | <include name="Db4LocalStorage.cs" /> | ||
15 | <include name="MapStorage.cs" /> | 16 | <include name="MapStorage.cs" /> |
16 | <include name="UUIDParcelQuery.cs" /> | 17 | <include name="UUIDParcelQuery.cs" /> |
17 | <include name="UUIDPrimQuery.cs" /> | 18 | <include name="UUIDPrimQuery.cs" /> |
18 | <include name="Db4LocalStorage.cs" /> | ||
19 | </sources> | 19 | </sources> |
20 | <references basedir="${project::get-base-directory()}"> | 20 | <references basedir="${project::get-base-directory()}"> |
21 | <lib> | 21 | <lib> |