diff options
| author | Dan Lake | 2011-07-11 12:23:20 -0700 |
|---|---|---|
| committer | Dan Lake | 2011-07-11 12:23:20 -0700 |
| commit | b9cbe92f30c97d6b402be73c8c6fd8e6894ef05a (patch) | |
| tree | 8fd2fa4567e2882e7f5dafdb8cf1de571917f23a /OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps | |
| parent | Checkin 32 bit bulletsim shared library for Linux. (diff) | |
| parent | minor Tack the prim name on the end of the "experimental mesh proxy generatio... (diff) | |
| download | opensim-SC-b9cbe92f30c97d6b402be73c8c6fd8e6894ef05a.zip opensim-SC-b9cbe92f30c97d6b402be73c8c6fd8e6894ef05a.tar.gz opensim-SC-b9cbe92f30c97d6b402be73c8c6fd8e6894ef05a.tar.bz2 opensim-SC-b9cbe92f30c97d6b402be73c8c6fd8e6894ef05a.tar.xz | |
Merge branch 'master' into bulletsim
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs index 3809f84..15ed3b3 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs | |||
| @@ -250,11 +250,9 @@ namespace OpenSim.Region.ClientStack.Linden | |||
| 250 | case 0x40: | 250 | case 0x40: |
| 251 | pbs.ReadProjectionData(extraParam.ExtraParamData, 0); | 251 | pbs.ReadProjectionData(extraParam.ExtraParamData, 0); |
| 252 | break; | 252 | break; |
| 253 | |||
| 254 | } | 253 | } |
| 255 | |||
| 256 | |||
| 257 | } | 254 | } |
| 255 | |||
| 258 | pbs.PathBegin = (ushort) obj.PathBegin; | 256 | pbs.PathBegin = (ushort) obj.PathBegin; |
| 259 | pbs.PathCurve = (byte) obj.PathCurve; | 257 | pbs.PathCurve = (byte) obj.PathCurve; |
| 260 | pbs.PathEnd = (ushort) obj.PathEnd; | 258 | pbs.PathEnd = (ushort) obj.PathEnd; |