aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--OpenSim.sln309
-rw-r--r--OpenSim/Framework/Servers/BaseHttpServer.cs5
-rw-r--r--OpenSim/Framework/Servers/LlsdMethod.cs3
-rw-r--r--OpenSim/Framework/Servers/OpenSim.Framework.Servers.csproj42
-rw-r--r--OpenSim/Framework/Servers/OpenSim.Framework.Servers.dll.build1
-rw-r--r--OpenSim/Region/Examples/SimpleApp/Program.cs7
-rw-r--r--OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj6
-rw-r--r--OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build1
-rw-r--r--prebuild.xml291
9 files changed, 382 insertions, 283 deletions
diff --git a/OpenSim.sln b/OpenSim.sln
index bd39235..54743ee 100644
--- a/OpenSim.sln
+++ b/OpenSim.sln
@@ -53,117 +53,200 @@ EndProject
53Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleApp", "OpenSim\Region\Examples\SimpleApp\SimpleApp.csproj", "{24B12448-0000-0000-0000-000000000000}" 53Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleApp", "OpenSim\Region\Examples\SimpleApp\SimpleApp.csproj", "{24B12448-0000-0000-0000-000000000000}"
54EndProject 54EndProject
55Global 55Global
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 = ({586E2916-0000-0000-0000-000000000000})
135 {F4FF31EB-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 135 ({24B12448-0000-0000-0000-000000000000}).6 = ({61FCCDB3-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 = ({39038E85-0000-0000-0000-000000000000})
137 {90620634-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 137 ({24B12448-0000-0000-0000-000000000000}).8 = ({DC3698B2-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 = ({BFB5D807-0000-0000-0000-000000000000})
139 {90620634-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 139 ({24B12448-0000-0000-0000-000000000000}).10 = ({DCBA491C-0000-0000-0000-000000000000})
140 {90620634-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 140 ({24B12448-0000-0000-0000-000000000000}).11 = ({241A8CDD-0000-0000-0000-000000000000})
141 {A6D191D8-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 141 ({24B12448-0000-0000-0000-000000000000}).12 = ({F4FF31EB-0000-0000-0000-000000000000})
142 {A6D191D8-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 142 EndGlobalSection
143 {A6D191D8-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 143 GlobalSection(ProjectConfigurationPlatforms) = postSolution
144 {A6D191D8-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 144 {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
145 {A4691E59-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 145 {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
146 {A4691E59-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 146 {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
147 {A4691E59-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 147 {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
148 {A4691E59-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 148 {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
149 {43DB702D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 149 {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
150 {43DB702D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 150 {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
151 {43DB702D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 151 {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
152 {43DB702D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 152 {CB52B7E7-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
153 {477B9270-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 153 {CB52B7E7-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
154 {477B9270-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 154 {CB52B7E7-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
155 {477B9270-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 155 {CB52B7E7-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
156 {477B9270-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 156 {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
157 {C9E0F891-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 157 {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
158 {C9E0F891-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 158 {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
159 {C9E0F891-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 159 {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
160 {C9E0F891-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 160 {36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
161 {24B12448-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 161 {36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
162 {24B12448-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 162 {36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
163 {24B12448-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 163 {36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
164 {24B12448-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 164 {FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
165 EndGlobalSection 165 {FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
166 GlobalSection(SolutionProperties) = preSolution 166 {FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
167 HideSolutionNode = FALSE 167 {FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
168 EndGlobalSection 168 {C74E4A30-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
169 {C74E4A30-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
170 {C74E4A30-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
171 {C74E4A30-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
172 {2CC71860-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
173 {2CC71860-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
174 {2CC71860-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
175 {2CC71860-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
176 {586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
177 {586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
178 {586E2916-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
179 {586E2916-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
180 {61FCCDB3-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
181 {61FCCDB3-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
182 {61FCCDB3-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
183 {61FCCDB3-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
184 {39038E85-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
185 {39038E85-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
186 {39038E85-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
187 {39038E85-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
188 {DC3698B2-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
189 {DC3698B2-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
190 {DC3698B2-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
191 {DC3698B2-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
192 {BFB5D807-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
193 {BFB5D807-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
194 {BFB5D807-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
195 {BFB5D807-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
196 {4806E378-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
197 {4806E378-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
198 {4806E378-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
199 {4806E378-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
200 {DCBA491C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
201 {DCBA491C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
202 {DCBA491C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
203 {DCBA491C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
204 {241A8CDD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
205 {241A8CDD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
206 {241A8CDD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
207 {241A8CDD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
208 {98C7B681-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
209 {98C7B681-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
210 {98C7B681-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
211 {98C7B681-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
212 {15B4FEF3-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
213 {15B4FEF3-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
214 {15B4FEF3-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
215 {15B4FEF3-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
216 {F4FF31EB-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
217 {F4FF31EB-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
218 {F4FF31EB-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
219 {F4FF31EB-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
220 {90620634-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
221 {90620634-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
222 {90620634-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
223 {90620634-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
224 {A6D191D8-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
225 {A6D191D8-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
226 {A6D191D8-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
227 {A6D191D8-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
228 {A4691E59-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
229 {A4691E59-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
230 {A4691E59-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
231 {A4691E59-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
232 {43DB702D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
233 {43DB702D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
234 {43DB702D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
235 {43DB702D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
236 {477B9270-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
237 {477B9270-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
238 {477B9270-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
239 {477B9270-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
240 {C9E0F891-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
241 {C9E0F891-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
242 {C9E0F891-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
243 {C9E0F891-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
244 {24B12448-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
245 {24B12448-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
246 {24B12448-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
247 {24B12448-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
248 EndGlobalSection
249 GlobalSection(SolutionProperties) = preSolution
250 HideSolutionNode = FALSE
251 EndGlobalSection
169EndGlobal 252EndGlobal
diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs
index 0442b1a..5dc1f56 100644
--- a/OpenSim/Framework/Servers/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/BaseHttpServer.cs
@@ -289,5 +289,10 @@ namespace OpenSim.Framework.Servers
289 OpenSim.Framework.Console.MainLog.Instance.WriteLine(LogPriority.MEDIUM, e.Message); 289 OpenSim.Framework.Console.MainLog.Instance.WriteLine(LogPriority.MEDIUM, e.Message);
290 } 290 }
291 } 291 }
292
293 public void AddLlsdMethod<TResponse, TRequest>(string path, LlsdMethod<TResponse, TRequest> handler )
294 {
295 throw new Exception("The method or operation is not implemented.");
296 }
292 } 297 }
293} 298}
diff --git a/OpenSim/Framework/Servers/LlsdMethod.cs b/OpenSim/Framework/Servers/LlsdMethod.cs
index 4ce4287..c66873f 100644
--- a/OpenSim/Framework/Servers/LlsdMethod.cs
+++ b/OpenSim/Framework/Servers/LlsdMethod.cs
@@ -4,5 +4,6 @@ using System.Text;
4 4
5namespace OpenSim.Framework.Servers 5namespace OpenSim.Framework.Servers
6{ 6{
7 public delegate string LlsdMethod(string request, string path, string param); 7 public delegate object LlsdMethod(object request, string path, string param);
8 public delegate TResponse LlsdMethod<TResponse, TRequest>( TRequest request );
8} 9}
diff --git a/OpenSim/Framework/Servers/OpenSim.Framework.Servers.csproj b/OpenSim/Framework/Servers/OpenSim.Framework.Servers.csproj
index d6d0815..38d611e 100644
--- a/OpenSim/Framework/Servers/OpenSim.Framework.Servers.csproj
+++ b/OpenSim/Framework/Servers/OpenSim.Framework.Servers.csproj
@@ -1,4 +1,4 @@
1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup> 2 <PropertyGroup>
3 <ProjectType>Local</ProjectType> 3 <ProjectType>Local</ProjectType>
4 <ProductVersion>8.0.50727</ProductVersion> 4 <ProductVersion>8.0.50727</ProductVersion>
@@ -6,8 +6,7 @@
6 <ProjectGuid>{2CC71860-0000-0000-0000-000000000000}</ProjectGuid> 6 <ProjectGuid>{2CC71860-0000-0000-0000-000000000000}</ProjectGuid>
7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> 8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
9 <ApplicationIcon> 9 <ApplicationIcon></ApplicationIcon>
10 </ApplicationIcon>
11 <AssemblyKeyContainerName> 10 <AssemblyKeyContainerName>
12 </AssemblyKeyContainerName> 11 </AssemblyKeyContainerName>
13 <AssemblyName>OpenSim.Framework.Servers</AssemblyName> 12 <AssemblyName>OpenSim.Framework.Servers</AssemblyName>
@@ -16,11 +15,9 @@
16 <DefaultTargetSchema>IE50</DefaultTargetSchema> 15 <DefaultTargetSchema>IE50</DefaultTargetSchema>
17 <DelaySign>false</DelaySign> 16 <DelaySign>false</DelaySign>
18 <OutputType>Library</OutputType> 17 <OutputType>Library</OutputType>
19 <AppDesignerFolder> 18 <AppDesignerFolder></AppDesignerFolder>
20 </AppDesignerFolder>
21 <RootNamespace>OpenSim.Framework.Servers</RootNamespace> 19 <RootNamespace>OpenSim.Framework.Servers</RootNamespace>
22 <StartupObject> 20 <StartupObject></StartupObject>
23 </StartupObject>
24 <FileUpgradeFlags> 21 <FileUpgradeFlags>
25 </FileUpgradeFlags> 22 </FileUpgradeFlags>
26 </PropertyGroup> 23 </PropertyGroup>
@@ -31,8 +28,7 @@
31 <ConfigurationOverrideFile> 28 <ConfigurationOverrideFile>
32 </ConfigurationOverrideFile> 29 </ConfigurationOverrideFile>
33 <DefineConstants>TRACE;DEBUG</DefineConstants> 30 <DefineConstants>TRACE;DEBUG</DefineConstants>
34 <DocumentationFile> 31 <DocumentationFile></DocumentationFile>
35 </DocumentationFile>
36 <DebugSymbols>True</DebugSymbols> 32 <DebugSymbols>True</DebugSymbols>
37 <FileAlignment>4096</FileAlignment> 33 <FileAlignment>4096</FileAlignment>
38 <Optimize>False</Optimize> 34 <Optimize>False</Optimize>
@@ -41,8 +37,7 @@
41 <RemoveIntegerChecks>False</RemoveIntegerChecks> 37 <RemoveIntegerChecks>False</RemoveIntegerChecks>
42 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 38 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
43 <WarningLevel>4</WarningLevel> 39 <WarningLevel>4</WarningLevel>
44 <NoWarn> 40 <NoWarn></NoWarn>
45 </NoWarn>
46 </PropertyGroup> 41 </PropertyGroup>
47 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> 42 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
48 <AllowUnsafeBlocks>False</AllowUnsafeBlocks> 43 <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
@@ -51,8 +46,7 @@
51 <ConfigurationOverrideFile> 46 <ConfigurationOverrideFile>
52 </ConfigurationOverrideFile> 47 </ConfigurationOverrideFile>
53 <DefineConstants>TRACE</DefineConstants> 48 <DefineConstants>TRACE</DefineConstants>
54 <DocumentationFile> 49 <DocumentationFile></DocumentationFile>
55 </DocumentationFile>
56 <DebugSymbols>False</DebugSymbols> 50 <DebugSymbols>False</DebugSymbols>
57 <FileAlignment>4096</FileAlignment> 51 <FileAlignment>4096</FileAlignment>
58 <Optimize>True</Optimize> 52 <Optimize>True</Optimize>
@@ -61,24 +55,22 @@
61 <RemoveIntegerChecks>False</RemoveIntegerChecks> 55 <RemoveIntegerChecks>False</RemoveIntegerChecks>
62 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 56 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
63 <WarningLevel>4</WarningLevel> 57 <WarningLevel>4</WarningLevel>
64 <NoWarn> 58 <NoWarn></NoWarn>
65 </NoWarn>
66 </PropertyGroup> 59 </PropertyGroup>
67 <ItemGroup> 60 <ItemGroup>
68 <Reference Include="libsecondlife.dll"> 61 <Reference Include="libsecondlife.dll" >
69 <HintPath>..\..\..\bin\libsecondlife.dll</HintPath> 62 <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
70 <Private>False</Private> 63 <Private>False</Private>
71 </Reference> 64 </Reference>
72 <Reference Include="System"> 65 <Reference Include="System" >
73 <HintPath>System.dll</HintPath> 66 <HintPath>System.dll</HintPath>
74 <Private>False</Private> 67 <Private>False</Private>
75 </Reference> 68 </Reference>
76 <Reference Include="System.Data" /> 69 <Reference Include="System.Xml" >
77 <Reference Include="System.Xml">
78 <HintPath>System.Xml.dll</HintPath> 70 <HintPath>System.Xml.dll</HintPath>
79 <Private>False</Private> 71 <Private>False</Private>
80 </Reference> 72 </Reference>
81 <Reference Include="XMLRPC.dll"> 73 <Reference Include="XMLRPC.dll" >
82 <HintPath>..\..\..\bin\XMLRPC.dll</HintPath> 74 <HintPath>..\..\..\bin\XMLRPC.dll</HintPath>
83 <Private>False</Private> 75 <Private>False</Private>
84 </Reference> 76 </Reference>
@@ -88,13 +80,13 @@
88 <Name>OpenSim.Framework</Name> 80 <Name>OpenSim.Framework</Name>
89 <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> 81 <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
90 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 82 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
91 <Private>False</Private> 83 <Private>False</Private>
92 </ProjectReference> 84 </ProjectReference>
93 <ProjectReference Include="..\Console\OpenSim.Framework.Console.csproj"> 85 <ProjectReference Include="..\Console\OpenSim.Framework.Console.csproj">
94 <Name>OpenSim.Framework.Console</Name> 86 <Name>OpenSim.Framework.Console</Name>
95 <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> 87 <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
96 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 88 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
97 <Private>False</Private> 89 <Private>False</Private>
98 </ProjectReference> 90 </ProjectReference>
99 </ItemGroup> 91 </ItemGroup>
100 <ItemGroup> 92 <ItemGroup>
@@ -104,7 +96,9 @@
104 <Compile Include="CheckSumServer.cs"> 96 <Compile Include="CheckSumServer.cs">
105 <SubType>Code</SubType> 97 <SubType>Code</SubType>
106 </Compile> 98 </Compile>
107 <Compile Include="LlsdMethod.cs" /> 99 <Compile Include="LlsdMethod.cs">
100 <SubType>Code</SubType>
101 </Compile>
108 <Compile Include="RestMethod.cs"> 102 <Compile Include="RestMethod.cs">
109 <SubType>Code</SubType> 103 <SubType>Code</SubType>
110 </Compile> 104 </Compile>
@@ -122,4 +116,4 @@
122 <PostBuildEvent> 116 <PostBuildEvent>
123 </PostBuildEvent> 117 </PostBuildEvent>
124 </PropertyGroup> 118 </PropertyGroup>
125</Project> \ No newline at end of file 119</Project>
diff --git a/OpenSim/Framework/Servers/OpenSim.Framework.Servers.dll.build b/OpenSim/Framework/Servers/OpenSim.Framework.Servers.dll.build
index 60b204d..6640a29 100644
--- a/OpenSim/Framework/Servers/OpenSim.Framework.Servers.dll.build
+++ b/OpenSim/Framework/Servers/OpenSim.Framework.Servers.dll.build
@@ -13,6 +13,7 @@
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="BaseHttpServer.cs" /> 14 <include name="BaseHttpServer.cs" />
15 <include name="CheckSumServer.cs" /> 15 <include name="CheckSumServer.cs" />
16 <include name="LlsdMethod.cs" />
16 <include name="RestMethod.cs" /> 17 <include name="RestMethod.cs" />
17 <include name="UDPServerBase.cs" /> 18 <include name="UDPServerBase.cs" />
18 <include name="XmlRpcMethod.cs" /> 19 <include name="XmlRpcMethod.cs" />
diff --git a/OpenSim/Region/Examples/SimpleApp/Program.cs b/OpenSim/Region/Examples/SimpleApp/Program.cs
index 3d9dd0d..2c5fb4d 100644
--- a/OpenSim/Region/Examples/SimpleApp/Program.cs
+++ b/OpenSim/Region/Examples/SimpleApp/Program.cs
@@ -17,6 +17,7 @@ using OpenSim.Region.ClientStack;
17using System.Net; 17using System.Net;
18using libsecondlife.Packets; 18using libsecondlife.Packets;
19using OpenSim.Physics.Manager; 19using OpenSim.Physics.Manager;
20using OpenSim.Region.Capabilities;
20 21
21namespace SimpleApp 22namespace SimpleApp
22{ 23{
@@ -63,6 +64,7 @@ namespace SimpleApp
63 udpServer.LocalWorld = world; 64 udpServer.LocalWorld = world;
64 65
65 httpServer.AddXmlRPCHandler("login_to_simulator", communicationsManager.UserServices.XmlRpcLoginMethod ); 66 httpServer.AddXmlRPCHandler("login_to_simulator", communicationsManager.UserServices.XmlRpcLoginMethod );
67 httpServer.AddLlsdMethod<LLSDMapLayerResponse, LLSDMapRequest>("/Caps/test/", LlsdMethodDemo);
66 httpServer.Start(); 68 httpServer.Start();
67 69
68 m_log.WriteLine( LogPriority.NORMAL, "Press enter to quit."); 70 m_log.WriteLine( LogPriority.NORMAL, "Press enter to quit.");
@@ -75,6 +77,11 @@ namespace SimpleApp
75 77
76 } 78 }
77 79
80 private LLSDMapLayerResponse LlsdMethodDemo(LLSDMapRequest request)
81 {
82 return new LLSDMapLayerResponse();
83 }
84
78 private bool AddNewSessionHandler(ulong regionHandle, Login loginData) 85 private bool AddNewSessionHandler(ulong regionHandle, Login loginData)
79 { 86 {
80 m_log.WriteLine(LogPriority.NORMAL, "Region [{0}] recieved Login from [{1}] [{2}]", regionHandle, loginData.First, loginData.Last); 87 m_log.WriteLine(LogPriority.NORMAL, "Region [{0}] recieved Login from [{1}] [{2}]", regionHandle, loginData.First, loginData.Last);
diff --git a/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj b/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj
index bb8dcc0..3ed0efc 100644
--- a/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj
+++ b/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj
@@ -116,6 +116,12 @@
116 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 116 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
117 <Private>False</Private> 117 <Private>False</Private>
118 </ProjectReference> 118 </ProjectReference>
119 <ProjectReference Include="..\..\Capabilities\OpenSim.Region.Capabilities.csproj">
120 <Name>OpenSim.Region.Capabilities</Name>
121 <Project>{39038E85-0000-0000-0000-000000000000}</Project>
122 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
123 <Private>False</Private>
124 </ProjectReference>
119 <ProjectReference Include="..\..\ClientStack\OpenSim.Region.ClientStack.csproj"> 125 <ProjectReference Include="..\..\ClientStack\OpenSim.Region.ClientStack.csproj">
120 <Name>OpenSim.Region.ClientStack</Name> 126 <Name>OpenSim.Region.ClientStack</Name>
121 <Project>{DC3698B2-0000-0000-0000-000000000000}</Project> 127 <Project>{DC3698B2-0000-0000-0000-000000000000}</Project>
diff --git a/OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build b/OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build
index aab0826..0c6234a 100644
--- a/OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build
+++ b/OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build
@@ -27,6 +27,7 @@
27 <include name="../../../../bin/OpenSim.Framework.Servers.dll" /> 27 <include name="../../../../bin/OpenSim.Framework.Servers.dll" />
28 <include name="../../../../bin/OpenSim.Framework.UserManagement.dll" /> 28 <include name="../../../../bin/OpenSim.Framework.UserManagement.dll" />
29 <include name="../../../../bin/OpenSim.Region.Caches.dll" /> 29 <include name="../../../../bin/OpenSim.Region.Caches.dll" />
30 <include name="../../../../bin/OpenSim.Region.Capabilities.dll" />
30 <include name="../../../../bin/OpenSim.Region.ClientStack.dll" /> 31 <include name="../../../../bin/OpenSim.Region.ClientStack.dll" />
31 <include name="../../../../bin/OpenSim.Region.Communications.Local.dll" /> 32 <include name="../../../../bin/OpenSim.Region.Communications.Local.dll" />
32 <include name="../../../../bin/OpenSim.Region.Environment.dll" /> 33 <include name="../../../../bin/OpenSim.Region.Environment.dll" />
diff --git a/prebuild.xml b/prebuild.xml
index 29c2a67..4078839 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -72,7 +72,7 @@
72 <Reference name="libsecondlife.dll"/> 72 <Reference name="libsecondlife.dll"/>
73 <Reference name="Db4objects.Db4o.dll"/> 73 <Reference name="Db4objects.Db4o.dll"/>
74 <Reference name="XMLRPC.dll"/> 74 <Reference name="XMLRPC.dll"/>
75 <Reference name="OpenSim.Framework.Console"/> 75 <Reference name="OpenSim.Framework.Console"/>
76 <Files> 76 <Files>
77 <Match pattern="*.cs" recurse="true"/> 77 <Match pattern="*.cs" recurse="true"/>
78 </Files> 78 </Files>
@@ -93,10 +93,10 @@
93 <ReferencePath>../../../bin/</ReferencePath> 93 <ReferencePath>../../../bin/</ReferencePath>
94 <Reference name="System"/> 94 <Reference name="System"/>
95 <Reference name="System.Xml"/> 95 <Reference name="System.Xml"/>
96 <Reference name="OpenSim.Framework"/> 96 <Reference name="OpenSim.Framework"/>
97 <Reference name="OpenSim.Framework.Console"/> 97 <Reference name="OpenSim.Framework.Console"/>
98 <Reference name="libsecondlife.dll"/> 98 <Reference name="libsecondlife.dll"/>
99 <Reference name="XMLRPC.dll"/> 99 <Reference name="XMLRPC.dll"/>
100 100
101 <Files> 101 <Files>
102 <Match pattern="*.cs" recurse="true"/> 102 <Match pattern="*.cs" recurse="true"/>
@@ -119,13 +119,13 @@
119 <Reference name="System"/> 119 <Reference name="System"/>
120 <Reference name="System.Xml"/> 120 <Reference name="System.Xml"/>
121 <Reference name="libsecondlife.dll"/> 121 <Reference name="libsecondlife.dll"/>
122 <Reference name="OpenSim.Framework"/> 122 <Reference name="OpenSim.Framework"/>
123 <Files> 123 <Files>
124 <Match pattern="*.cs" recurse="true"/> 124 <Match pattern="*.cs" recurse="true"/>
125 </Files> 125 </Files>
126 </Project> 126 </Project>
127 127
128 <Project name="OpenSim.Region.Capabilities" path="OpenSim/Region/Capabilities" type="Library"> 128 <Project name="OpenSim.Region.Capabilities" path="OpenSim/Region/Capabilities" type="Library">
129 <Configuration name="Debug"> 129 <Configuration name="Debug">
130 <Options> 130 <Options>
131 <OutputPath>../../../bin/</OutputPath> 131 <OutputPath>../../../bin/</OutputPath>
@@ -140,11 +140,11 @@
140 <ReferencePath>../../../bin/</ReferencePath> 140 <ReferencePath>../../../bin/</ReferencePath>
141 <Reference name="System"/> 141 <Reference name="System"/>
142 <Reference name="System.Xml"/> 142 <Reference name="System.Xml"/>
143 <Reference name="libsecondlife.dll"/> 143 <Reference name="libsecondlife.dll"/>
144 <Reference name="OpenSim.Framework"/> 144 <Reference name="OpenSim.Framework"/>
145 <Reference name="OpenSim.Framework.Servers"/> 145 <Reference name="OpenSim.Framework.Servers"/>
146 <Reference name="OpenSim.Region.Caches"/> 146 <Reference name="OpenSim.Region.Caches"/>
147 <Reference name="XMLRPC.dll"/> 147 <Reference name="XMLRPC.dll"/>
148 148
149 <Files> 149 <Files>
150 <Match pattern="*.cs" recurse="true"/> 150 <Match pattern="*.cs" recurse="true"/>
@@ -175,7 +175,7 @@
175 <Match pattern="*.cs" recurse="true"/> 175 <Match pattern="*.cs" recurse="true"/>
176 </Files> 176 </Files>
177 </Project> 177 </Project>
178 178
179 <Project name="OpenSim.Region.Storage.LocalStorageSQLite" path="OpenSim/Region/Storage/LocalStorageSQLite" type="Library"> 179 <Project name="OpenSim.Region.Storage.LocalStorageSQLite" path="OpenSim/Region/Storage/LocalStorageSQLite" type="Library">
180 <Configuration name="Debug"> 180 <Configuration name="Debug">
181 <Options> 181 <Options>
@@ -275,7 +275,7 @@
275 <Match pattern="*.cs" recurse="true"/> 275 <Match pattern="*.cs" recurse="true"/>
276 </Files> 276 </Files>
277 </Project> 277 </Project>
278 278
279 279
280 <Project name="OpenSim.Region.Physics.Manager" path="OpenSim/Region/Physics/Manager" type="Library"> 280 <Project name="OpenSim.Region.Physics.Manager" path="OpenSim/Region/Physics/Manager" type="Library">
281 <Configuration name="Debug"> 281 <Configuration name="Debug">
@@ -361,15 +361,15 @@
361 <Reference name="System" localCopy="false"/> 361 <Reference name="System" localCopy="false"/>
362 <Reference name="Axiom.MathLib.dll" localCopy="false"/> 362 <Reference name="Axiom.MathLib.dll" localCopy="false"/>
363 <Reference name="OpenSim.Region.Physics.Manager" localCopy="false"/> 363 <Reference name="OpenSim.Region.Physics.Manager" localCopy="false"/>
364 <Reference name="Ode.NET.dll" localCopy="false" /> 364 <Reference name="Ode.NET.dll" localCopy="false" />
365 365
366 <Files> 366 <Files>
367 <Match pattern="*.cs" recurse="true"/> 367 <Match pattern="*.cs" recurse="true"/>
368 </Files> 368 </Files>
369 </Project> 369 </Project>
370 370
371 <!-- Xml Config Dll --> 371 <!-- Xml Config Dll -->
372 <Project name="OpenSim.Framework.GenericConfig.Xml" path="OpenSim/Framework/GenericConfig/Xml" type="Library"> 372 <Project name="OpenSim.Framework.GenericConfig.Xml" path="OpenSim/Framework/GenericConfig/Xml" type="Library">
373 <Configuration name="Debug"> 373 <Configuration name="Debug">
374 <Options> 374 <Options>
375 <OutputPath>../../../../bin/</OutputPath> 375 <OutputPath>../../../../bin/</OutputPath>
@@ -384,15 +384,15 @@
384 <ReferencePath>../../../../bin/</ReferencePath> 384 <ReferencePath>../../../../bin/</ReferencePath>
385 <Reference name="System"/> 385 <Reference name="System"/>
386 <Reference name="System.Xml"/> 386 <Reference name="System.Xml"/>
387 <Reference name="OpenSim.Framework"/> 387 <Reference name="OpenSim.Framework"/>
388 388
389 <Files> 389 <Files>
390 <Match pattern="*.cs" recurse="true"/> 390 <Match pattern="*.cs" recurse="true"/>
391 </Files> 391 </Files>
392 </Project> 392 </Project>
393 393
394 <!-- Terrain engine --> 394 <!-- Terrain engine -->
395 <Project name="OpenSim.Region.Terrain.BasicTerrain" path="OpenSim/Region/Terrain.BasicTerrain" type="Library"> 395 <Project name="OpenSim.Region.Terrain.BasicTerrain" path="OpenSim/Region/Terrain.BasicTerrain" type="Library">
396 <Configuration name="Debug"> 396 <Configuration name="Debug">
397 <Options> 397 <Options>
398 <OutputPath>../../../bin/</OutputPath> 398 <OutputPath>../../../bin/</OutputPath>
@@ -475,27 +475,27 @@
475 <OutputPath>../../../bin/</OutputPath> 475 <OutputPath>../../../bin/</OutputPath>
476 </Options> 476 </Options>
477 </Configuration> 477 </Configuration>
478 478
479 <ReferencePath>../../../bin/</ReferencePath> 479 <ReferencePath>../../../bin/</ReferencePath>
480 <Reference name="System" localCopy="false"/> 480 <Reference name="System" localCopy="false"/>
481 <Reference name="System.Data" localCopy="false"/> 481 <Reference name="System.Data" localCopy="false"/>
482 <Reference name="System.Xml" localCopy="false"/> 482 <Reference name="System.Xml" localCopy="false"/>
483 <Reference name="XMLRPC.dll"/> 483 <Reference name="XMLRPC.dll"/>
484 <Reference name="OpenSim.Framework"/> 484 <Reference name="OpenSim.Framework"/>
485 <Reference name="OpenSim.Framework.Console"/> 485 <Reference name="OpenSim.Framework.Console"/>
486 <Reference name="OpenSim.Framework.Data"/> 486 <Reference name="OpenSim.Framework.Data"/>
487 <Reference name="OpenSim.Framework.GenericConfig.Xml"/> 487 <Reference name="OpenSim.Framework.GenericConfig.Xml"/>
488 <Reference name="OpenSim.Framework.Servers"/> 488 <Reference name="OpenSim.Framework.Servers"/>
489 <Reference name="libsecondlife.dll"/> 489 <Reference name="libsecondlife.dll"/>
490 <Reference name="Db4objects.Db4o.dll"/> 490 <Reference name="Db4objects.Db4o.dll"/>
491 491
492 <Files> 492 <Files>
493 <Match pattern="*.cs" recurse="true"/> 493 <Match pattern="*.cs" recurse="true"/>
494 </Files> 494 </Files>
495 </Project> 495 </Project>
496 496
497 <!-- OpenSim.Framework.Communications --> 497 <!-- OpenSim.Framework.Communications -->
498 <Project name="OpenSim.Framework.Communications" path="OpenSim/Framework/Communications" type="Library"> 498 <Project name="OpenSim.Framework.Communications" path="OpenSim/Framework/Communications" type="Library">
499 <Configuration name="Debug"> 499 <Configuration name="Debug">
500 <Options> 500 <Options>
501 <OutputPath>../../../bin/</OutputPath> 501 <OutputPath>../../../bin/</OutputPath>
@@ -510,9 +510,9 @@
510 <ReferencePath>../../../bin/</ReferencePath> 510 <ReferencePath>../../../bin/</ReferencePath>
511 <Reference name="System"/> 511 <Reference name="System"/>
512 <Reference name="System.Xml"/> 512 <Reference name="System.Xml"/>
513 <Reference name="OpenSim.Framework"/> 513 <Reference name="OpenSim.Framework"/>
514 <Reference name="OpenSim.Framework.Data" /> 514 <Reference name="OpenSim.Framework.Data" />
515 <Reference name="libsecondlife.dll"/> 515 <Reference name="libsecondlife.dll"/>
516 516
517 <Files> 517 <Files>
518 <Match pattern="*.cs" recurse="true"/> 518 <Match pattern="*.cs" recurse="true"/>
@@ -548,7 +548,7 @@
548 <Match pattern="*.cs" recurse="true"/> 548 <Match pattern="*.cs" recurse="true"/>
549 </Files> 549 </Files>
550 </Project> 550 </Project>
551 551
552 <Project name="OpenSim.Region.Communications.Local" path="OpenSim/Region/Communications/Local" type="Library"> 552 <Project name="OpenSim.Region.Communications.Local" path="OpenSim/Region/Communications/Local" type="Library">
553 <Configuration name="Debug"> 553 <Configuration name="Debug">
554 <Options> 554 <Options>
@@ -564,11 +564,11 @@
564 <ReferencePath>../../../../bin/</ReferencePath> 564 <ReferencePath>../../../../bin/</ReferencePath>
565 <Reference name="System"/> 565 <Reference name="System"/>
566 <Reference name="System.Xml"/> 566 <Reference name="System.Xml"/>
567 <Reference name="OpenSim.Framework.Communications"/> 567 <Reference name="OpenSim.Framework.Communications"/>
568 <Reference name="OpenSim.Framework.UserManagement" /> 568 <Reference name="OpenSim.Framework.UserManagement" />
569 <Reference name="OpenSim.Framework.Data" /> 569 <Reference name="OpenSim.Framework.Data" />
570 <Reference name="libsecondlife.dll"/> 570 <Reference name="libsecondlife.dll"/>
571 <Reference name="OpenSim.Framework"/> 571 <Reference name="OpenSim.Framework"/>
572 572
573 <Files> 573 <Files>
574 <Match pattern="*.cs" recurse="true"/> 574 <Match pattern="*.cs" recurse="true"/>
@@ -632,8 +632,8 @@
632 <Reference name="OpenSim.Framework.GenericConfig.Xml"/> 632 <Reference name="OpenSim.Framework.GenericConfig.Xml"/>
633 <Reference name="OpenSim.Region.Physics.Manager"/> 633 <Reference name="OpenSim.Region.Physics.Manager"/>
634 <Reference name="OpenSim.Framework.Servers"/> 634 <Reference name="OpenSim.Framework.Servers"/>
635 <Reference name="OpenSim.Region.Caches"/> 635 <Reference name="OpenSim.Region.Caches"/>
636 <Reference name="OpenSim.Region.Capabilities"/> 636 <Reference name="OpenSim.Region.Capabilities"/>
637 <!-- For scripting in funny languages by default --> 637 <!-- For scripting in funny languages by default -->
638 <Reference name="Microsoft.JScript"/> 638 <Reference name="Microsoft.JScript"/>
639 <Reference name="XMLRPC.dll"/> 639 <Reference name="XMLRPC.dll"/>
@@ -669,12 +669,12 @@
669 <Reference name="OpenSim.Framework.Console"/> 669 <Reference name="OpenSim.Framework.Console"/>
670 <Reference name="OpenSim.Region.Physics.Manager"/> 670 <Reference name="OpenSim.Region.Physics.Manager"/>
671 <Reference name="OpenSim.Framework.Servers"/> 671 <Reference name="OpenSim.Framework.Servers"/>
672 <Reference name="OpenSim.Region.Environment"/> 672 <Reference name="OpenSim.Region.Environment"/>
673 <Reference name="OpenSim.Region.ClientStack"/> 673 <Reference name="OpenSim.Region.ClientStack"/>
674 <Reference name="OpenSim.Framework.GenericConfig.Xml"/> 674 <Reference name="OpenSim.Framework.GenericConfig.Xml"/>
675 <Reference name="OpenSim.Framework.Communications"/> 675 <Reference name="OpenSim.Framework.Communications"/>
676 <Reference name="OpenSim.Region.Communications.OGS1"/> 676 <Reference name="OpenSim.Region.Communications.OGS1"/>
677 <Reference name="OpenSim.Region.Caches"/> 677 <Reference name="OpenSim.Region.Caches"/>
678 <Reference name="XMLRPC.dll"/> 678 <Reference name="XMLRPC.dll"/>
679 <Reference name="OpenSim.Framework.UserManagement" /> 679 <Reference name="OpenSim.Framework.UserManagement" />
680 <Reference name="OpenSim.Region.Communications.Local"/> 680 <Reference name="OpenSim.Region.Communications.Local"/>
@@ -683,8 +683,8 @@
683 <Match pattern="*.cs" recurse="true"/> 683 <Match pattern="*.cs" recurse="true"/>
684 </Files> 684 </Files>
685 </Project> 685 </Project>
686 686
687 <!-- Scene Server API Example Apps --> 687 <!-- Scene Server API Example Apps -->
688 688
689 <Project name="SimpleApp" path="OpenSim/Region/Examples/SimpleApp" type="Exe"> 689 <Project name="SimpleApp" path="OpenSim/Region/Examples/SimpleApp" type="Exe">
690 <Configuration name="Debug"> 690 <Configuration name="Debug">
@@ -699,7 +699,7 @@
699 </Configuration> 699 </Configuration>
700 700
701 <ReferencePath>../../../../bin/</ReferencePath> 701 <ReferencePath>../../../../bin/</ReferencePath>
702 <ReferencePath>../../../../bin/Physics/</ReferencePath> 702 <ReferencePath>../../../../bin/Physics/</ReferencePath>
703 703
704 <Reference name="libsecondlife.dll"/> 704 <Reference name="libsecondlife.dll"/>
705 <Reference name="System" localCopy="false"/> 705 <Reference name="System" localCopy="false"/>
@@ -710,25 +710,26 @@
710 <Reference name="OpenSim.Framework"/> 710 <Reference name="OpenSim.Framework"/>
711 <Reference name="OpenSim.Framework.UserManagement"/> 711 <Reference name="OpenSim.Framework.UserManagement"/>
712 <Reference name="OpenSim.Region.Physics.Manager"/> 712 <Reference name="OpenSim.Region.Physics.Manager"/>
713 <Reference name="OpenSim.Region.Capabilities"/>
713 <Reference name="XMLRPC.dll"/> 714 <Reference name="XMLRPC.dll"/>
714 <Reference name="OpenSim.Region.GridInterfaces.Local"/> 715 <Reference name="OpenSim.Region.GridInterfaces.Local"/>
715 <Reference name="OpenSim.Framework.Servers"/> 716 <Reference name="OpenSim.Framework.Servers"/>
716<Reference name="OpenSim.Framework.Communications"/> 717 <Reference name="OpenSim.Framework.Communications"/>
717<Reference name="OpenSim.Region.Communications.Local"/> 718 <Reference name="OpenSim.Region.Communications.Local"/>
718 <Reference name="OpenSim.Region.Caches"/> 719 <Reference name="OpenSim.Region.Caches"/>
719 <Reference name="OpenSim.Region.ClientStack"/> 720 <Reference name="OpenSim.Region.ClientStack"/>
720 <Reference name="OpenSim.Region.Environment"/> 721 <Reference name="OpenSim.Region.Environment"/>
721 722
722 723
723 <Files> 724 <Files>
724 <Match pattern="*.cs" recurse="true"/> 725 <Match pattern="*.cs" recurse="true"/>
725 </Files> 726 </Files>
726 </Project> 727 </Project>
727 728
728</Solution> 729 </Solution>
729 730
730 731
731<Solution name="OpenGridServices" activeConfig="Debug" path="./"> 732 <Solution name="OpenGridServices" activeConfig="Debug" path="./">
732 <Configuration name="Debug"> 733 <Configuration name="Debug">
733 <Options> 734 <Options>
734 <CompilerDefines>TRACE;DEBUG</CompilerDefines> 735 <CompilerDefines>TRACE;DEBUG</CompilerDefines>
@@ -760,8 +761,8 @@
760 </Options> 761 </Options>
761 </Configuration> 762 </Configuration>
762 763
763 764
764 <!-- OpenSim Data Services --> 765 <!-- OpenSim Data Services -->
765 <Project name="OpenSim.Framework.Data" path="OpenSim/Framework/Data" type="Library"> 766 <Project name="OpenSim.Framework.Data" path="OpenSim/Framework/Data" type="Library">
766 <Configuration name="Debug"> 767 <Configuration name="Debug">
767 <Options> 768 <Options>
@@ -879,9 +880,9 @@
879 </Files> 880 </Files>
880 </Project> 881 </Project>
881 882
882 <!-- OGS projects --> 883 <!-- OGS projects -->
883 884
884 <Project name="OpenSim.Grid.Framework.Manager" path="OpenSim/Grid/Framework.Manager" type="Library"> 885 <Project name="OpenSim.Grid.Framework.Manager" path="OpenSim/Grid/Framework.Manager" type="Library">
885 <Configuration name="Debug"> 886 <Configuration name="Debug">
886 <Options> 887 <Options>
887 <OutputPath>../../../bin/</OutputPath> 888 <OutputPath>../../../bin/</OutputPath>
@@ -893,19 +894,19 @@
893 </Options> 894 </Options>
894 </Configuration> 895 </Configuration>
895 896
896 <ReferencePath>../../../bin/</ReferencePath> 897 <ReferencePath>../../../bin/</ReferencePath>
897 <Reference name="System" localCopy="false"/> 898 <Reference name="System" localCopy="false"/>
898 <Reference name="OpenSim.Framework"/> 899 <Reference name="OpenSim.Framework"/>
899 <Reference name="OpenSim.Framework.Servers"/> 900 <Reference name="OpenSim.Framework.Servers"/>
900 <Reference name="libsecondlife.dll"/> 901 <Reference name="libsecondlife.dll"/>
901 <Reference name="XMLRPC.dll"/> 902 <Reference name="XMLRPC.dll"/>
902 903
903 904
904 <Files> 905 <Files>
905 <Match pattern="*.cs" recurse="true"/> 906 <Match pattern="*.cs" recurse="true"/>
906 </Files> 907 </Files>
907 </Project> 908 </Project>
908 909
909 <Project name="OpenSim.Grid.GridServer" path="OpenSim/Grid/GridServer" type="Exe"> 910 <Project name="OpenSim.Grid.GridServer" path="OpenSim/Grid/GridServer" type="Exe">
910 <Configuration name="Debug"> 911 <Configuration name="Debug">
911 <Options> 912 <Options>
@@ -918,26 +919,26 @@
918 </Options> 919 </Options>
919 </Configuration> 920 </Configuration>
920 921
921 <ReferencePath>../../../bin/</ReferencePath> 922 <ReferencePath>../../../bin/</ReferencePath>
922 <Reference name="System" localCopy="false"/> 923 <Reference name="System" localCopy="false"/>
923 <Reference name="System.Data" localCopy="false"/> 924 <Reference name="System.Data" localCopy="false"/>
924 <Reference name="System.Xml" localCopy="false"/> 925 <Reference name="System.Xml" localCopy="false"/>
925 <Reference name="OpenSim.Framework"/> 926 <Reference name="OpenSim.Framework"/>
926 <Reference name="OpenSim.Framework.Console"/> 927 <Reference name="OpenSim.Framework.Console"/>
927 <Reference name="OpenSim.Framework.Servers"/> 928 <Reference name="OpenSim.Framework.Servers"/>
928 <Reference name="OpenSim.Framework.Data"/> 929 <Reference name="OpenSim.Framework.Data"/>
929 <Reference name="OpenSim.Grid.Framework.Manager"/> 930 <Reference name="OpenSim.Grid.Framework.Manager"/>
930 <Reference name="OpenSim.Framework.GenericConfig.Xml"/> 931 <Reference name="OpenSim.Framework.GenericConfig.Xml"/>
931 <Reference name="libsecondlife.dll"/> 932 <Reference name="libsecondlife.dll"/>
932 <Reference name="Db4objects.Db4o.dll"/> 933 <Reference name="Db4objects.Db4o.dll"/>
933 <Reference name="XMLRPC.dll"/> 934 <Reference name="XMLRPC.dll"/>
934 935
935 <Files> 936 <Files>
936 <Match pattern="*.cs" recurse="true"/> 937 <Match pattern="*.cs" recurse="true"/>
937 </Files> 938 </Files>
938 </Project> 939 </Project>
939 940
940 <Project name="OpenSim.Grid.AssetServer" path="OpenSim/Grid/AssetServer" type="Exe"> 941 <Project name="OpenSim.Grid.AssetServer" path="OpenSim/Grid/AssetServer" type="Exe">
941 <Configuration name="Debug"> 942 <Configuration name="Debug">
942 <Options> 943 <Options>
943 <OutputPath>../../../bin/</OutputPath> 944 <OutputPath>../../../bin/</OutputPath>
@@ -949,20 +950,20 @@
949 </Options> 950 </Options>
950 </Configuration> 951 </Configuration>
951 952
952 <ReferencePath>../../../bin/</ReferencePath> 953 <ReferencePath>../../../bin/</ReferencePath>
953 <Reference name="System" localCopy="false"/> 954 <Reference name="System" localCopy="false"/>
954 <Reference name="System.Data" localCopy="false"/> 955 <Reference name="System.Data" localCopy="false"/>
955 <Reference name="System.Xml" localCopy="false"/> 956 <Reference name="System.Xml" localCopy="false"/>
956 <Reference name="OpenSim.Framework"/> 957 <Reference name="OpenSim.Framework"/>
957 <Reference name="OpenSim.Framework.Console"/> 958 <Reference name="OpenSim.Framework.Console"/>
958 <Reference name="OpenSim.Framework.Servers"/> 959 <Reference name="OpenSim.Framework.Servers"/>
959 <Reference name="libsecondlife.dll"/> 960 <Reference name="libsecondlife.dll"/>
960 <Reference name="Db4objects.Db4o.dll"/> 961 <Reference name="Db4objects.Db4o.dll"/>
961 <Reference name="XMLRPC.dll"/> 962 <Reference name="XMLRPC.dll"/>
962 963
963 <Files> 964 <Files>
964 <Match pattern="*.cs" recurse="true"/> 965 <Match pattern="*.cs" recurse="true"/>
965 </Files> 966 </Files>
966 </Project> 967 </Project>
967 968
968 <Project name="OpenSim.Framework.UserManagement" path="OpenSim/Framework/UserManager" type="Library"> 969 <Project name="OpenSim.Framework.UserManagement" path="OpenSim/Framework/UserManager" type="Library">
@@ -976,23 +977,23 @@
976 <OutputPath>../../../bin/</OutputPath> 977 <OutputPath>../../../bin/</OutputPath>
977 </Options> 978 </Options>
978 </Configuration> 979 </Configuration>
979 980
980 <ReferencePath>../../../bin/</ReferencePath> 981 <ReferencePath>../../../bin/</ReferencePath>
981 <Reference name="System" localCopy="false"/> 982 <Reference name="System" localCopy="false"/>
982 <Reference name="System.Data" localCopy="false"/> 983 <Reference name="System.Data" localCopy="false"/>
983 <Reference name="System.Xml" localCopy="false"/> 984 <Reference name="System.Xml" localCopy="false"/>
984 <Reference name="OpenSim.Framework"/> 985 <Reference name="OpenSim.Framework"/>
985 <Reference name="OpenSim.Framework.Console"/> 986 <Reference name="OpenSim.Framework.Console"/>
986 <Reference name="OpenSim.Framework.Data"/> 987 <Reference name="OpenSim.Framework.Data"/>
987 <Reference name="OpenSim.Framework.GenericConfig.Xml"/> 988 <Reference name="OpenSim.Framework.GenericConfig.Xml"/>
988 <Reference name="OpenSim.Framework.Servers"/> 989 <Reference name="OpenSim.Framework.Servers"/>
989 <Reference name="libsecondlife.dll"/> 990 <Reference name="libsecondlife.dll"/>
990 <Reference name="Db4objects.Db4o.dll"/> 991 <Reference name="Db4objects.Db4o.dll"/>
991 <Reference name="XMLRPC.dll"/> 992 <Reference name="XMLRPC.dll"/>
992 993
993 <Files> 994 <Files>
994 <Match pattern="*.cs" recurse="true"/> 995 <Match pattern="*.cs" recurse="true"/>
995 </Files> 996 </Files>
996 </Project> 997 </Project>
997 998
998 <Project name="OpenSim.Grid.UserServer" path="OpenSim/Grid/UserServer" type="Exe"> 999 <Project name="OpenSim.Grid.UserServer" path="OpenSim/Grid/UserServer" type="Exe">
@@ -1006,24 +1007,24 @@
1006 <OutputPath>../../../bin/</OutputPath> 1007 <OutputPath>../../../bin/</OutputPath>
1007 </Options> 1008 </Options>
1008 </Configuration> 1009 </Configuration>
1009 1010
1010 <ReferencePath>../../../bin/</ReferencePath> 1011 <ReferencePath>../../../bin/</ReferencePath>
1011 <Reference name="System" localCopy="false"/> 1012 <Reference name="System" localCopy="false"/>
1012 <Reference name="System.Data" localCopy="false"/> 1013 <Reference name="System.Data" localCopy="false"/>
1013 <Reference name="System.Xml" localCopy="false"/> 1014 <Reference name="System.Xml" localCopy="false"/>
1014 <Reference name="OpenSim.Framework"/> 1015 <Reference name="OpenSim.Framework"/>
1015 <Reference name="OpenSim.Framework.Console"/> 1016 <Reference name="OpenSim.Framework.Console"/>
1016 <Reference name="OpenSim.Framework.Data"/> 1017 <Reference name="OpenSim.Framework.Data"/>
1017 <Reference name="OpenSim.Framework.GenericConfig.Xml"/> 1018 <Reference name="OpenSim.Framework.GenericConfig.Xml"/>
1018 <Reference name="OpenSim.Framework.Servers"/> 1019 <Reference name="OpenSim.Framework.Servers"/>
1019 <Reference name="OpenSim.Framework.UserManagement" /> 1020 <Reference name="OpenSim.Framework.UserManagement" />
1020 <Reference name="libsecondlife.dll"/> 1021 <Reference name="libsecondlife.dll"/>
1021 <Reference name="Db4objects.Db4o.dll"/> 1022 <Reference name="Db4objects.Db4o.dll"/>
1022 <Reference name="XMLRPC.dll"/> 1023 <Reference name="XMLRPC.dll"/>
1023 1024
1024 <Files> 1025 <Files>
1025 <Match pattern="*.cs" recurse="true"/> 1026 <Match pattern="*.cs" recurse="true"/>
1026 </Files> 1027 </Files>
1027 </Project> 1028 </Project>
1028 1029
1029 <Project name="OpenSim.Grid.GridServer.Config" path="OpenSim/Grid/GridServer.Config" type="Library"> 1030 <Project name="OpenSim.Grid.GridServer.Config" path="OpenSim/Grid/GridServer.Config" type="Library">
@@ -1075,10 +1076,10 @@
1075 <Match pattern="*.cs" recurse="true"/> 1076 <Match pattern="*.cs" recurse="true"/>
1076 </Files> 1077 </Files>
1077 </Project> 1078 </Project>
1078 1079
1079</Solution> 1080 </Solution>
1080 1081
1081 1082
1082 <!-- Prebuild tool --> 1083 <!-- Prebuild tool -->
1083 <Solution name="Prebuild" path="Prebuild/" > 1084 <Solution name="Prebuild" path="Prebuild/" >
1084 <Configuration name="Debug"> 1085 <Configuration name="Debug">
generated by cgit v1.1 at 2024-11-05 00:44:25 +0000