diff options
| author | Melanie | 2012-01-31 20:53:49 +0000 |
|---|---|---|
| committer | Melanie | 2012-01-31 20:53:49 +0000 |
| commit | 1b63b21a4db192cdfb24748be523dd53bbba47a9 (patch) | |
| tree | a9c45afd55fb652e35c9a703560c7e35af2cdfa6 /OpenSim/Data/IAssetData.cs | |
| parent | Make parcel sale overlays work. No auction support. (diff) | |
| parent | Remove scene object null check on SceneGraph.AddSceneObject(). Complain expl... (diff) | |
| download | opensim-SC-1b63b21a4db192cdfb24748be523dd53bbba47a9.zip opensim-SC-1b63b21a4db192cdfb24748be523dd53bbba47a9.tar.gz opensim-SC-1b63b21a4db192cdfb24748be523dd53bbba47a9.tar.bz2 opensim-SC-1b63b21a4db192cdfb24748be523dd53bbba47a9.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Application/OpenSimBase.cs
Diffstat (limited to 'OpenSim/Data/IAssetData.cs')
0 files changed, 0 insertions, 0 deletions