diff options
| author | John Hurliman | 2010-02-22 14:10:19 -0800 |
|---|---|---|
| committer | John Hurliman | 2010-02-22 14:10:19 -0800 |
| commit | 71c6559a91a58d93588dcdd8c74b5fce0c1a3780 (patch) | |
| tree | cca5b1ea88ad4b29156767afdd77e37ec072c8a7 /OpenSim/Region/Framework/Scenes/SceneBase.cs | |
| parent | * Adds CreatorID to asset metadata. This is just the plumbing to support Crea... (diff) | |
| parent | Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/open... (diff) | |
| download | opensim-SC_OLD-71c6559a91a58d93588dcdd8c74b5fce0c1a3780.zip opensim-SC_OLD-71c6559a91a58d93588dcdd8c74b5fce0c1a3780.tar.gz opensim-SC_OLD-71c6559a91a58d93588dcdd8c74b5fce0c1a3780.tar.bz2 opensim-SC_OLD-71c6559a91a58d93588dcdd8c74b5fce0c1a3780.tar.xz | |
Merge branch 'presence-refactor' of ssh://opensimulator.org/var/git/opensim into presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneBase.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneBase.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs index aed8640..4f6e824 100644 --- a/OpenSim/Region/Framework/Scenes/SceneBase.cs +++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs | |||
| @@ -262,7 +262,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 262 | /// Returns a new unallocated local ID | 262 | /// Returns a new unallocated local ID |
| 263 | /// </summary> | 263 | /// </summary> |
| 264 | /// <returns>A brand new local ID</returns> | 264 | /// <returns>A brand new local ID</returns> |
| 265 | protected internal uint AllocateLocalId() | 265 | public uint AllocateLocalId() |
| 266 | { | 266 | { |
| 267 | uint myID; | 267 | uint myID; |
| 268 | 268 | ||