diff options
| author | Kitto Flora | 2010-03-12 13:48:31 -0500 |
|---|---|---|
| committer | Kitto Flora | 2010-03-12 13:48:31 -0500 |
| commit | 7bd48d383d3383c1e633f76f76a5291f4224d48a (patch) | |
| tree | 18997a5b1a123091af18a1a7984d7dd7873930ac /OpenSim/Framework/RegionInfo.cs | |
| parent | Dynamics Integration Part 1 (diff) | |
| parent | Small consistency change (diff) | |
| download | opensim-SC_OLD-7bd48d383d3383c1e633f76f76a5291f4224d48a.zip opensim-SC_OLD-7bd48d383d3383c1e633f76f76a5291f4224d48a.tar.gz opensim-SC_OLD-7bd48d383d3383c1e633f76f76a5291f4224d48a.tar.bz2 opensim-SC_OLD-7bd48d383d3383c1e633f76f76a5291f4224d48a.tar.xz | |
Resolved merge
Diffstat (limited to 'OpenSim/Framework/RegionInfo.cs')
| -rw-r--r-- | OpenSim/Framework/RegionInfo.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs index 1ea08f9..99edd99 100644 --- a/OpenSim/Framework/RegionInfo.cs +++ b/OpenSim/Framework/RegionInfo.cs | |||
| @@ -790,7 +790,6 @@ namespace OpenSim.Framework | |||
| 790 | else | 790 | else |
| 791 | m_externalHostName = externalName; | 791 | m_externalHostName = externalName; |
| 792 | 792 | ||
| 793 | |||
| 794 | // Master avatar cruft | 793 | // Master avatar cruft |
| 795 | // | 794 | // |
| 796 | string masterAvatarUUID; | 795 | string masterAvatarUUID; |