diff options
| author | Melanie | 2011-11-19 22:39:15 +0000 |
|---|---|---|
| committer | Melanie | 2011-11-19 22:39:15 +0000 |
| commit | bdb5ac96d9432eb568ed3e3bb46b012365f884bc (patch) | |
| tree | fe2ce2636be7e750b3f235a6c04b9f3a5cf2f8af /OpenSim/Data/IAssetData.cs | |
| parent | Merge branch 'master' into bigmerge (diff) | |
| parent | Remove the "[LOCAL SIMULATION CONNECTOR]: Did not find region {0} for SendCre... (diff) | |
| download | opensim-SC-bdb5ac96d9432eb568ed3e3bb46b012365f884bc.zip opensim-SC-bdb5ac96d9432eb568ed3e3bb46b012365f884bc.tar.gz opensim-SC-bdb5ac96d9432eb568ed3e3bb46b012365f884bc.tar.bz2 opensim-SC-bdb5ac96d9432eb568ed3e3bb46b012365f884bc.tar.xz | |
Merge branch 'master' into bigmerge
Conflicts:
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions