diff options
| author | UbitUmarov | 2012-02-10 23:03:30 +0000 |
|---|---|---|
| committer | UbitUmarov | 2012-02-10 23:03:30 +0000 |
| commit | e3f5fd81f1bdcccb5fb0cad75d85bf1f733667d7 (patch) | |
| tree | 0fff77027caf8e6ba723489c45e0cf1cb77bb0ec /OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs | |
| parent | Changes to vehicles code etc. Includes some debug aids to remove later. (diff) | |
| parent | Merge branch 'master' into careminster (diff) | |
| download | opensim-SC-e3f5fd81f1bdcccb5fb0cad75d85bf1f733667d7.zip opensim-SC-e3f5fd81f1bdcccb5fb0cad75d85bf1f733667d7.tar.gz opensim-SC-e3f5fd81f1bdcccb5fb0cad75d85bf1f733667d7.tar.bz2 opensim-SC-e3f5fd81f1bdcccb5fb0cad75d85bf1f733667d7.tar.xz | |
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
Conflicts:
prebuild.xml
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs index e4bacd4..7a3d97e 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs | |||
| @@ -339,7 +339,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
| 339 | m_scene.AddSceneObject(grp); | 339 | m_scene.AddSceneObject(grp); |
| 340 | grp.AbsolutePosition = obj.Position; | 340 | grp.AbsolutePosition = obj.Position; |
| 341 | } | 341 | } |
| 342 | 342 | ||
| 343 | allparts[i] = grp; | 343 | allparts[i] = grp; |
| 344 | } | 344 | } |
| 345 | 345 | ||