diff options
| author | Melanie | 2012-01-26 00:21:21 +0000 |
|---|---|---|
| committer | Melanie | 2012-01-26 00:21:21 +0000 |
| commit | 4ce42762ee2a8ae323b6a1d118bb4b9b0f447caf (patch) | |
| tree | 6173c8da92084547e89db40e5762a74249b4a8db /OpenSim/Services/Connectors/Simulation/SimulationDataService.cs | |
| parent | Typo fix (diff) | |
| parent | refactor: change RezScriptFromAgentInventory(), RezNewScript() and AddInvento... (diff) | |
| download | opensim-SC-4ce42762ee2a8ae323b6a1d118bb4b9b0f447caf.zip opensim-SC-4ce42762ee2a8ae323b6a1d118bb4b9b0f447caf.tar.gz opensim-SC-4ce42762ee2a8ae323b6a1d118bb4b9b0f447caf.tar.bz2 opensim-SC-4ce42762ee2a8ae323b6a1d118bb4b9b0f447caf.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Services/Connectors/Simulation/SimulationDataService.cs')
0 files changed, 0 insertions, 0 deletions