diff options
| author | Melanie | 2013-03-29 02:19:12 +0000 |
|---|---|---|
| committer | Melanie | 2013-03-29 02:19:12 +0000 |
| commit | e7d76c91c227ccd40af5067d28b5f08dfbcbc093 (patch) | |
| tree | b7f91898700fe85567a4ba1c9783631daafd3a2b /OpenSim/Framework | |
| parent | Merge commit 'c92654fb43f303da8e1623f9fff8a404aad72374' into careminster (diff) | |
| parent | Eliminate code which tries to restart attachment scripts in ScenePresence.Mak... (diff) | |
| download | opensim-SC-e7d76c91c227ccd40af5067d28b5f08dfbcbc093.zip opensim-SC-e7d76c91c227ccd40af5067d28b5f08dfbcbc093.tar.gz opensim-SC-e7d76c91c227ccd40af5067d28b5f08dfbcbc093.tar.bz2 opensim-SC-e7d76c91c227ccd40af5067d28b5f08dfbcbc093.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'OpenSim/Framework')
0 files changed, 0 insertions, 0 deletions