diff options
author | UbitUmarov | 2015-11-01 03:01:59 +0000 |
---|---|---|
committer | UbitUmarov | 2015-11-01 03:01:59 +0000 |
commit | 72684592ba196095311b308407cbe5751c6dd8dd (patch) | |
tree | c51a1fb67c6d425b1cb904e788bac8a720d951c8 /OpenSim/Services/Interfaces/IAvatarService.cs | |
parent | fix cut points of UTF-8 strings (diff) | |
parent | Minor: Add an initializer to show what the default value would be. (diff) | |
download | opensim-SC_OLD-72684592ba196095311b308407cbe5751c6dd8dd.zip opensim-SC_OLD-72684592ba196095311b308407cbe5751c6dd8dd.tar.gz opensim-SC_OLD-72684592ba196095311b308407cbe5751c6dd8dd.tar.bz2 opensim-SC_OLD-72684592ba196095311b308407cbe5751c6dd8dd.tar.xz |
Merge branch 'master' into avinationmerge
Conflicts:
OpenSim/Framework/AvatarAppearance.cs
OpenSim/Framework/Servers/ServerBase.cs
OpenSim/Framework/VersionInfo.cs
OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs
OpenSim/Region/PhysicsModules/Ode/ODEPrim.cs
OpenSim/Region/PhysicsModules/Ode/OdeScene.cs
OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
OpenSim/Services/HypergridService/GatekeeperService.cs
OpenSim/Services/Interfaces/IAvatarService.cs
OpenSim/Services/LLLoginService/LLLoginService.cs
Diffstat (limited to 'OpenSim/Services/Interfaces/IAvatarService.cs')
-rw-r--r-- | OpenSim/Services/Interfaces/IAvatarService.cs | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/OpenSim/Services/Interfaces/IAvatarService.cs b/OpenSim/Services/Interfaces/IAvatarService.cs index 3663a7a..bd66dad 100644 --- a/OpenSim/Services/Interfaces/IAvatarService.cs +++ b/OpenSim/Services/Interfaces/IAvatarService.cs | |||
@@ -162,12 +162,11 @@ namespace OpenSim.Services.Interfaces | |||
162 | } | 162 | } |
163 | 163 | ||
164 | // Visual Params | 164 | // Visual Params |
165 | // string[] vps = new string[AvatarAppearance.VISUALPARAM_COUNT]; | 165 | //string[] vps = new string[AvatarAppearance.VISUALPARAM_COUNT]; |
166 | // byte[] binary = appearance.VisualParams; | 166 | //byte[] binary = appearance.VisualParams; |
167 | 167 | ||
168 | // for (int i = 0 ; i < AvatarAppearance.VISUALPARAM_COUNT ; i++) | 168 | // for (int i = 0 ; i < AvatarAppearance.VISUALPARAM_COUNT ; i++) |
169 | 169 | ||
170 | |||
171 | byte[] binary = appearance.VisualParams; | 170 | byte[] binary = appearance.VisualParams; |
172 | string[] vps = new string[binary.Length]; | 171 | string[] vps = new string[binary.Length]; |
173 | 172 | ||
@@ -285,14 +284,13 @@ namespace OpenSim.Services.Interfaces | |||
285 | if (Data.ContainsKey("VisualParams")) | 284 | if (Data.ContainsKey("VisualParams")) |
286 | { | 285 | { |
287 | string[] vps = Data["VisualParams"].Split(new char[] {','}); | 286 | string[] vps = Data["VisualParams"].Split(new char[] {','}); |
288 | // byte[] binary = new byte[AvatarAppearance.VISUALPARAM_COUNT]; | 287 | //byte[] binary = new byte[AvatarAppearance.VISUALPARAM_COUNT]; |
289 | 288 | ||
290 | // for (int i = 0 ; i < vps.Length && i < binary.Length ; i++) | 289 | //for (int i = 0 ; i < vps.Length && i < binary.Length ; i++) |
291 | byte[] binary = new byte[vps.Length]; | 290 | byte[] binary = new byte[vps.Length]; |
292 | 291 | ||
293 | for (int i = 0; i < vps.Length; i++) | 292 | for (int i = 0; i < vps.Length; i++) |
294 | 293 | binary[i] = (byte)Convert.ToInt32(vps[i]); | |
295 | binary[i] = (byte)Convert.ToInt32(vps[i]); | ||
296 | 294 | ||
297 | appearance.VisualParams = binary; | 295 | appearance.VisualParams = binary; |
298 | } | 296 | } |