diff options
| author | Diva Canto | 2010-02-22 09:56:33 -0800 |
|---|---|---|
| committer | Diva Canto | 2010-02-22 09:56:33 -0800 |
| commit | de91a9e09bbb6c41eeb022540ae08952f413fb12 (patch) | |
| tree | f4a40f7999f9c55661162b2764c883f764597973 /OpenSim/Region/Framework/Scenes/SceneBase.cs | |
| parent | Deleted duplicate [GridService] section. (diff) | |
| parent | Merge branch 'master' into presence-refactor (diff) | |
| download | opensim-SC-de91a9e09bbb6c41eeb022540ae08952f413fb12.zip opensim-SC-de91a9e09bbb6c41eeb022540ae08952f413fb12.tar.gz opensim-SC-de91a9e09bbb6c41eeb022540ae08952f413fb12.tar.bz2 opensim-SC-de91a9e09bbb6c41eeb022540ae08952f413fb12.tar.xz | |
Merge branch 'presence-refactor' of ssh://diva@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 | ||