diff options
| author | Tom Grimshaw | 2010-06-29 23:19:08 -0700 |
|---|---|---|
| committer | Tom Grimshaw | 2010-06-29 23:19:08 -0700 |
| commit | 9012084d1192cd98c367c6c9682b69f9d49af069 (patch) | |
| tree | 27ba292f6915010ea373fc1b6d278c9904ea53db /OpenSim/Framework | |
| parent | The other half of the asset fix. Implement an exponentially incrementing retr... (diff) | |
| parent | Comment the "Notecard saved" notification that pops up when a notecard (diff) | |
| download | opensim-SC-9012084d1192cd98c367c6c9682b69f9d49af069.zip opensim-SC-9012084d1192cd98c367c6c9682b69f9d49af069.tar.gz opensim-SC-9012084d1192cd98c367c6c9682b69f9d49af069.tar.bz2 opensim-SC-9012084d1192cd98c367c6c9682b69f9d49af069.tar.xz | |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Framework/PrimitiveBaseShape.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs index 4d1de22..990c859 100644 --- a/OpenSim/Framework/PrimitiveBaseShape.cs +++ b/OpenSim/Framework/PrimitiveBaseShape.cs | |||
| @@ -1196,7 +1196,7 @@ namespace OpenSim.Framework | |||
| 1196 | prim.Textures = this.Textures; | 1196 | prim.Textures = this.Textures; |
| 1197 | 1197 | ||
| 1198 | prim.Properties = new Primitive.ObjectProperties(); | 1198 | prim.Properties = new Primitive.ObjectProperties(); |
| 1199 | prim.Properties.Name = "Primitive"; | 1199 | prim.Properties.Name = "Object"; |
| 1200 | prim.Properties.Description = ""; | 1200 | prim.Properties.Description = ""; |
| 1201 | prim.Properties.CreatorID = UUID.Zero; | 1201 | prim.Properties.CreatorID = UUID.Zero; |
| 1202 | prim.Properties.GroupID = UUID.Zero; | 1202 | prim.Properties.GroupID = UUID.Zero; |