diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim.sln | 198 | ||||
-rw-r--r-- | OpenSim/Application.cs | 64 | ||||
-rw-r--r-- | OpenSim/OpenSim.csproj | 3 | ||||
-rw-r--r-- | OpenSim/OpenSim.exe.build | 1 | ||||
-rw-r--r-- | OpenSim/RegionServer.cs | 64 |
5 files changed, 149 insertions, 181 deletions
diff --git a/OpenSim.sln b/OpenSim.sln index c747832..5df577f 100644 --- a/OpenSim.sln +++ b/OpenSim.sln | |||
@@ -37,121 +37,85 @@ EndProject | |||
37 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.GridServer", "OpenGridServices.GridServer\OpenGridServices.GridServer.csproj", "{21BFC8E2-0000-0000-0000-000000000000}" | 37 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.GridServer", "OpenGridServices.GridServer\OpenGridServices.GridServer.csproj", "{21BFC8E2-0000-0000-0000-000000000000}" |
38 | EndProject | 38 | EndProject |
39 | Global | 39 | Global |
40 | GlobalSection(SolutionConfigurationPlatforms) = preSolution | 40 | GlobalSection(SolutionConfigurationPlatforms) = preSolution |
41 | Debug|Any CPU = Debug|Any CPU | 41 | Debug|Any CPU = Debug|Any CPU |
42 | Release|Any CPU = Release|Any CPU | 42 | Release|Any CPU = Release|Any CPU |
43 | EndGlobalSection | 43 | EndGlobalSection |
44 | GlobalSection(ProjectDependencies) = postSolution | 44 | GlobalSection(ProjectConfigurationPlatforms) = postSolution |
45 | ({438A9556-0000-0000-0000-000000000000}).5 = ({8ACA2445-0000-0000-0000-000000000000}) | 45 | {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
46 | ({438A9556-0000-0000-0000-000000000000}).6 = ({A7CD0630-0000-0000-0000-000000000000}) | 46 | {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
47 | ({438A9556-0000-0000-0000-000000000000}).7 = ({8BE16150-0000-0000-0000-000000000000}) | 47 | {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
48 | ({438A9556-0000-0000-0000-000000000000}).8 = ({8BB20F0A-0000-0000-0000-000000000000}) | 48 | {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
49 | ({438A9556-0000-0000-0000-000000000000}).9 = ({632E1BFD-0000-0000-0000-000000000000}) | 49 | {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
50 | ({63A05FE9-0000-0000-0000-000000000000}).2 = ({8BE16150-0000-0000-0000-000000000000}) | 50 | {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
51 | ({E88EF749-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000}) | 51 | {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
52 | ({8BE16150-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000}) | 52 | {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
53 | ({8BE16150-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000}) | 53 | {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
54 | ({66591469-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000}) | 54 | {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
55 | ({66591469-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000}) | 55 | {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
56 | ({83C87BE6-0000-0000-0000-000000000000}).5 = ({8ACA2445-0000-0000-0000-000000000000}) | 56 | {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
57 | ({83C87BE6-0000-0000-0000-000000000000}).6 = ({A7CD0630-0000-0000-0000-000000000000}) | 57 | {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
58 | ({4F874463-0000-0000-0000-000000000000}).2 = ({8BE16150-0000-0000-0000-000000000000}) | 58 | {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
59 | ({B0027747-0000-0000-0000-000000000000}).5 = ({8ACA2445-0000-0000-0000-000000000000}) | 59 | {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
60 | ({B0027747-0000-0000-0000-000000000000}).6 = ({A7CD0630-0000-0000-0000-000000000000}) | 60 | {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
61 | ({8BB20F0A-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000}) | 61 | {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
62 | ({8BB20F0A-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000}) | 62 | {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
63 | ({988F0AC4-0000-0000-0000-000000000000}).3 = ({8BE16150-0000-0000-0000-000000000000}) | 63 | {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
64 | ({B55C0B5D-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000}) | 64 | {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
65 | ({B55C0B5D-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000}) | 65 | {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
66 | ({632E1BFD-0000-0000-0000-000000000000}).5 = ({8ACA2445-0000-0000-0000-000000000000}) | 66 | {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
67 | ({632E1BFD-0000-0000-0000-000000000000}).6 = ({A7CD0630-0000-0000-0000-000000000000}) | 67 | {66591469-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
68 | ({632E1BFD-0000-0000-0000-000000000000}).7 = ({E88EF749-0000-0000-0000-000000000000}) | 68 | {66591469-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
69 | ({632E1BFD-0000-0000-0000-000000000000}).8 = ({8BE16150-0000-0000-0000-000000000000}) | 69 | {83C87BE6-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
70 | ({632E1BFD-0000-0000-0000-000000000000}).9 = ({8BB20F0A-0000-0000-0000-000000000000}) | 70 | {83C87BE6-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
71 | ({E1B79ECF-0000-0000-0000-000000000000}).4 = ({8ACA2445-0000-0000-0000-000000000000}) | 71 | {83C87BE6-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
72 | ({E1B79ECF-0000-0000-0000-000000000000}).5 = ({A7CD0630-0000-0000-0000-000000000000}) | 72 | {83C87BE6-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
73 | ({7E494328-0000-0000-0000-000000000000}).5 = ({8ACA2445-0000-0000-0000-000000000000}) | 73 | {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
74 | ({7E494328-0000-0000-0000-000000000000}).6 = ({A7CD0630-0000-0000-0000-000000000000}) | 74 | {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
75 | ({546099CD-0000-0000-0000-000000000000}).4 = ({8ACA2445-0000-0000-0000-000000000000}) | 75 | {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
76 | ({546099CD-0000-0000-0000-000000000000}).5 = ({A7CD0630-0000-0000-0000-000000000000}) | 76 | {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
77 | ({21BFC8E2-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000}) | 77 | {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
78 | ({21BFC8E2-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000}) | 78 | {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
79 | EndGlobalSection | 79 | {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
80 | GlobalSection(ProjectConfigurationPlatforms) = postSolution | 80 | {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
81 | {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 81 | {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
82 | {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 82 | {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
83 | {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 83 | {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
84 | {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 84 | {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
85 | {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 85 | {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
86 | {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 86 | {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
87 | {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 87 | {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
88 | {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 88 | {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
89 | {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 89 | {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
90 | {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 90 | {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
91 | {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 91 | {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
92 | {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 92 | {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
93 | {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 93 | {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
94 | {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 94 | {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
95 | {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 95 | {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
96 | {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 96 | {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
97 | {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 97 | {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
98 | {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 98 | {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
99 | {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 99 | {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
100 | {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 100 | {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
101 | {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 101 | {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
102 | {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 102 | {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
103 | {66591469-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 103 | {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
104 | {66591469-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 104 | {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
105 | {83C87BE6-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 105 | {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
106 | {83C87BE6-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 106 | {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
107 | {83C87BE6-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 107 | {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
108 | {83C87BE6-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 108 | {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
109 | {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 109 | {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
110 | {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 110 | {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
111 | {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 111 | {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
112 | {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 112 | {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
113 | {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 113 | {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
114 | {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 114 | {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
115 | {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 115 | {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
116 | {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 116 | {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
117 | {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 117 | EndGlobalSection |
118 | {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 118 | GlobalSection(SolutionProperties) = preSolution |
119 | {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 119 | HideSolutionNode = FALSE |
120 | {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 120 | EndGlobalSection |
121 | {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
122 | {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
123 | {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
124 | {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
125 | {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
126 | {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
127 | {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
128 | {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
129 | {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
130 | {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
131 | {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
132 | {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
133 | {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
134 | {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
135 | {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
136 | {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
137 | {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
138 | {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
139 | {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
140 | {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
141 | {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
142 | {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
143 | {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
144 | {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
145 | {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
146 | {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
147 | {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
148 | {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
149 | {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
150 | {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
151 | {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
152 | {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
153 | EndGlobalSection | ||
154 | GlobalSection(SolutionProperties) = preSolution | ||
155 | HideSolutionNode = FALSE | ||
156 | EndGlobalSection | ||
157 | EndGlobal | 121 | EndGlobal |
diff --git a/OpenSim/Application.cs b/OpenSim/Application.cs new file mode 100644 index 0000000..34dbf8e --- /dev/null +++ b/OpenSim/Application.cs | |||
@@ -0,0 +1,64 @@ | |||
1 | using System; | ||
2 | using System.Collections.Generic; | ||
3 | using System.Text; | ||
4 | using OpenSim.UserServer; | ||
5 | using OpenSim.Framework.Console; | ||
6 | |||
7 | namespace OpenSim | ||
8 | { | ||
9 | public class Application | ||
10 | { | ||
11 | [STAThread] | ||
12 | public static void Main(string[] args) | ||
13 | { | ||
14 | Console.WriteLine("OpenSim " + VersionInfo.Version + "\n"); | ||
15 | Console.WriteLine("Starting...\n"); | ||
16 | |||
17 | bool sandBoxMode = false; | ||
18 | bool startLoginServer = false; | ||
19 | string physicsEngine = "basicphysics"; | ||
20 | bool allowFlying = false; | ||
21 | bool userAccounts = false; | ||
22 | |||
23 | for (int i = 0; i < args.Length; i++) | ||
24 | { | ||
25 | if (args[i] == "-sandbox") | ||
26 | { | ||
27 | sandBoxMode = true; | ||
28 | } | ||
29 | |||
30 | if (args[i] == "-loginserver") | ||
31 | { | ||
32 | startLoginServer = true; | ||
33 | } | ||
34 | if (args[i] == "-accounts") | ||
35 | { | ||
36 | userAccounts = true; | ||
37 | } | ||
38 | if (args[i] == "-realphysx") | ||
39 | { | ||
40 | physicsEngine = "RealPhysX"; | ||
41 | allowFlying = true; | ||
42 | } | ||
43 | if (args[i] == "-ode") | ||
44 | { | ||
45 | physicsEngine = "OpenDynamicsEngine"; | ||
46 | allowFlying = true; | ||
47 | } | ||
48 | } | ||
49 | |||
50 | OpenSimMain sim = new OpenSimMain( sandBoxMode, startLoginServer, physicsEngine ); | ||
51 | // OpenSimRoot.Instance.Application = sim; | ||
52 | sim.m_sandbox = sandBoxMode; | ||
53 | sim.user_accounts = userAccounts; | ||
54 | OpenSim.world.Avatar.PhysicsEngineFlying = allowFlying; | ||
55 | |||
56 | sim.StartUp(); | ||
57 | |||
58 | while (true) | ||
59 | { | ||
60 | OpenSim.Framework.Console.MainConsole.Instance.MainConsolePrompt(); | ||
61 | } | ||
62 | } | ||
63 | } | ||
64 | } | ||
diff --git a/OpenSim/OpenSim.csproj b/OpenSim/OpenSim.csproj index f56206f..000d3e5 100644 --- a/OpenSim/OpenSim.csproj +++ b/OpenSim/OpenSim.csproj | |||
@@ -112,6 +112,9 @@ | |||
112 | </ProjectReference> | 112 | </ProjectReference> |
113 | </ItemGroup> | 113 | </ItemGroup> |
114 | <ItemGroup> | 114 | <ItemGroup> |
115 | <Compile Include="Application.cs"> | ||
116 | <SubType>Code</SubType> | ||
117 | </Compile> | ||
115 | <Compile Include="RegionServer.cs"> | 118 | <Compile Include="RegionServer.cs"> |
116 | <SubType>Code</SubType> | 119 | <SubType>Code</SubType> |
117 | </Compile> | 120 | </Compile> |
diff --git a/OpenSim/OpenSim.exe.build b/OpenSim/OpenSim.exe.build index deb4cfb..78124ae 100644 --- a/OpenSim/OpenSim.exe.build +++ b/OpenSim/OpenSim.exe.build | |||
@@ -11,6 +11,7 @@ | |||
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="Application.cs" /> | ||
14 | <include name="RegionServer.cs" /> | 15 | <include name="RegionServer.cs" /> |
15 | </sources> | 16 | </sources> |
16 | <references basedir="${project::get-base-directory()}"> | 17 | <references basedir="${project::get-base-directory()}"> |
diff --git a/OpenSim/RegionServer.cs b/OpenSim/RegionServer.cs index 56813f5..e69de29 100644 --- a/OpenSim/RegionServer.cs +++ b/OpenSim/RegionServer.cs | |||
@@ -1,64 +0,0 @@ | |||
1 | using System; | ||
2 | using System.Collections.Generic; | ||
3 | using System.Text; | ||
4 | using OpenSim.UserServer; | ||
5 | using OpenSim.Framework.Console; | ||
6 | |||
7 | namespace OpenSim | ||
8 | { | ||
9 | public class RegionServer | ||
10 | { | ||
11 | [STAThread] | ||
12 | public static void Main(string[] args) | ||
13 | { | ||
14 | Console.WriteLine("OpenSim " + VersionInfo.Version + "\n"); | ||
15 | Console.WriteLine("Starting...\n"); | ||
16 | |||
17 | bool sandBoxMode = false; | ||
18 | bool startLoginServer = false; | ||
19 | string physicsEngine = "basicphysics"; | ||
20 | bool allowFlying = false; | ||
21 | bool userAccounts = false; | ||
22 | |||
23 | for (int i = 0; i < args.Length; i++) | ||
24 | { | ||
25 | if (args[i] == "-sandbox") | ||
26 | { | ||
27 | sandBoxMode = true; | ||
28 | } | ||
29 | |||
30 | if (args[i] == "-loginserver") | ||
31 | { | ||
32 | startLoginServer = true; | ||
33 | } | ||
34 | if (args[i] == "-accounts") | ||
35 | { | ||
36 | userAccounts = true; | ||
37 | } | ||
38 | if (args[i] == "-realphysx") | ||
39 | { | ||
40 | physicsEngine = "RealPhysX"; | ||
41 | allowFlying = true; | ||
42 | } | ||
43 | if (args[i] == "-ode") | ||
44 | { | ||
45 | physicsEngine = "OpenDynamicsEngine"; | ||
46 | allowFlying = true; | ||
47 | } | ||
48 | } | ||
49 | |||
50 | OpenSimMain sim = new OpenSimMain( sandBoxMode, startLoginServer, physicsEngine ); | ||
51 | // OpenSimRoot.Instance.Application = sim; | ||
52 | sim.m_sandbox = sandBoxMode; | ||
53 | sim.user_accounts = userAccounts; | ||
54 | OpenSim.world.Avatar.PhysicsEngineFlying = allowFlying; | ||
55 | |||
56 | sim.StartUp(); | ||
57 | |||
58 | while (true) | ||
59 | { | ||
60 | OpenSim.Framework.Console.MainConsole.Instance.MainConsolePrompt(); | ||
61 | } | ||
62 | } | ||
63 | } | ||
64 | } | ||