diff options
| author | Melanie | 2011-10-11 23:21:36 +0100 |
|---|---|---|
| committer | Melanie | 2011-10-11 23:21:36 +0100 |
| commit | 1b3ea64fe9dbc499696feed70237dffc215ce01b (patch) | |
| tree | 71f1dff109f07dcace1e43c55ff7ae7ba0ced80d /OpenSim/Framework/TextureRequestArgs.cs | |
| parent | Merge commit 'e77c919290e166f19e77f3ef040418dd39f2f5bd' into bigmerge (diff) | |
| parent | Remove vestigal RegionStatus.SlaveScene. (diff) | |
| download | opensim-SC-1b3ea64fe9dbc499696feed70237dffc215ce01b.zip opensim-SC-1b3ea64fe9dbc499696feed70237dffc215ce01b.tar.gz opensim-SC-1b3ea64fe9dbc499696feed70237dffc215ce01b.tar.bz2 opensim-SC-1b3ea64fe9dbc499696feed70237dffc215ce01b.tar.xz | |
Merge commit '37ae6451f9ddb2e07402a5e79a9ab58668781104' into bigmerge
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Framework/TextureRequestArgs.cs')
0 files changed, 0 insertions, 0 deletions