diff options
| author | Melanie | 2012-02-01 09:45:42 +0000 |
|---|---|---|
| committer | Melanie | 2012-02-01 09:45:42 +0000 |
| commit | cc1476fc3614aaa1e63da2c62b0fa21bbd46183e (patch) | |
| tree | 9f36463d4e674c089c6ddee9920130d394abe267 /OpenSim/Region/Framework | |
| parent | Fix copy/paste errors (diff) | |
| parent | HG: This hopefully fixes the HG teleports back home to OSGrid. Looks like Uri... (diff) | |
| download | opensim-SC_OLD-cc1476fc3614aaa1e63da2c62b0fa21bbd46183e.zip opensim-SC_OLD-cc1476fc3614aaa1e63da2c62b0fa21bbd46183e.tar.gz opensim-SC_OLD-cc1476fc3614aaa1e63da2c62b0fa21bbd46183e.tar.bz2 opensim-SC_OLD-cc1476fc3614aaa1e63da2c62b0fa21bbd46183e.tar.xz | |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 739c5fa..e7f2fdb 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
| @@ -264,6 +264,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 264 | set { RootPart.Name = value; } | 264 | set { RootPart.Name = value; } |
| 265 | } | 265 | } |
| 266 | 266 | ||
| 267 | public string Description | ||
| 268 | { | ||
| 269 | get { return RootPart.Description; } | ||
| 270 | set { RootPart.Description = value; } | ||
| 271 | } | ||
| 272 | |||
| 267 | /// <summary> | 273 | /// <summary> |
| 268 | /// Added because the Parcel code seems to use it | 274 | /// Added because the Parcel code seems to use it |
| 269 | /// but not sure a object should have this | 275 | /// but not sure a object should have this |