diff options
| author | Melanie | 2012-06-02 02:01:48 +0100 |
|---|---|---|
| committer | Melanie | 2012-06-02 02:01:48 +0100 |
| commit | 8e735efff0849c45dd24ae15dfdf34f7959701c5 (patch) | |
| tree | 55b5f15068782e2dba04deb4d0e8b1ff90140cba /OpenSim/Capabilities/LLSDInventoryItem.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Fix LSL animation state reporting and animation state transitions on crossing (diff) | |
| download | opensim-SC-8e735efff0849c45dd24ae15dfdf34f7959701c5.zip opensim-SC-8e735efff0849c45dd24ae15dfdf34f7959701c5.tar.gz opensim-SC-8e735efff0849c45dd24ae15dfdf34f7959701c5.tar.bz2 opensim-SC-8e735efff0849c45dd24ae15dfdf34f7959701c5.tar.xz | |
Merge branch 'avination' into careminster
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Capabilities/LLSDInventoryItem.cs')
0 files changed, 0 insertions, 0 deletions