aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/MapImageService/Properties/AssemblyInfo.cs
diff options
context:
space:
mode:
authorRobert Adams2014-01-04 08:57:51 -0800
committerRobert Adams2014-01-04 08:57:51 -0800
commitfd045d520ee5142425b5e253e499b82d6bea63e2 (patch)
tree3833c264c9c6da3fed58576aeece466553589656 /OpenSim/Services/MapImageService/Properties/AssemblyInfo.cs
parentvarregion: Add region size to teleport event messages (EnableSimulator, (diff)
parentInitialize default region size in GridRegion in the no parameter constructor (diff)
downloadopensim-SC_OLD-fd045d520ee5142425b5e253e499b82d6bea63e2.zip
opensim-SC_OLD-fd045d520ee5142425b5e253e499b82d6bea63e2.tar.gz
opensim-SC_OLD-fd045d520ee5142425b5e253e499b82d6bea63e2.tar.bz2
opensim-SC_OLD-fd045d520ee5142425b5e253e499b82d6bea63e2.tar.xz
Merge branch 'master' into varregion
Conflicts: OpenSim/Framework/Constants.cs OpenSim/Framework/RegionInfo.cs OpenSim/Services/GridService/GridService.cs OpenSim/Services/Interfaces/IGridService.cs Most conflicts had to do with Util routines not in master branch yet.
Diffstat (limited to 'OpenSim/Services/MapImageService/Properties/AssemblyInfo.cs')
0 files changed, 0 insertions, 0 deletions
generated by cgit v1.1 at 2024-12-30 21:07:39 +0000