diff options
| author | Melanie Thielker | 2014-06-21 00:39:55 +0200 |
|---|---|---|
| committer | Melanie Thielker | 2014-06-21 00:39:55 +0200 |
| commit | 159fcbf150b7da0e229b29aa7b94793484543d12 (patch) | |
| tree | b8c0ff3b4c758a3fba8315b556c923ef4c02a185 /bin/assets/ScriptsAssetSet/ScriptsAssetSet.xml | |
| parent | Merge commit '68c8633ba18f0a11cfc0ed04d1d0c7c59e6cec76' (diff) | |
| parent | Merge branch 'master' into careminster (diff) | |
| download | opensim-SC-159fcbf150b7da0e229b29aa7b94793484543d12.zip opensim-SC-159fcbf150b7da0e229b29aa7b94793484543d12.tar.gz opensim-SC-159fcbf150b7da0e229b29aa7b94793484543d12.tar.bz2 opensim-SC-159fcbf150b7da0e229b29aa7b94793484543d12.tar.xz | |
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
Diffstat (limited to 'bin/assets/ScriptsAssetSet/ScriptsAssetSet.xml')
| -rw-r--r-- | bin/assets/ScriptsAssetSet/ScriptsAssetSet.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bin/assets/ScriptsAssetSet/ScriptsAssetSet.xml b/bin/assets/ScriptsAssetSet/ScriptsAssetSet.xml index c76cb78..eae9642 100644 --- a/bin/assets/ScriptsAssetSet/ScriptsAssetSet.xml +++ b/bin/assets/ScriptsAssetSet/ScriptsAssetSet.xml | |||
| @@ -89,9 +89,9 @@ | |||
| 89 | <Key Name="assetType" Value="10" /> | 89 | <Key Name="assetType" Value="10" /> |
| 90 | <Key Name="fileName" Value="llResetLandBanList.lsl" /> | 90 | <Key Name="fileName" Value="llResetLandBanList.lsl" /> |
| 91 | </Section> | 91 | </Section> |
| 92 | <Section Name="llResetLandPassList"> | 92 | <Section Name="llSay"> |
| 93 | <Key Name="assetID" Value="366ac8e9-b391-11dc-8314-0800200c9a66" /> | 93 | <Key Name="assetID" Value="366ac8e9-b391-11dc-8314-0800200c9a66" /> |
| 94 | <Key Name="name" Value="llResetLandPassList" /> | 94 | <Key Name="name" Value="llSay" /> |
| 95 | <Key Name="assetType" Value="10" /> | 95 | <Key Name="assetType" Value="10" /> |
| 96 | <Key Name="fileName" Value="llSay.lsl" /> | 96 | <Key Name="fileName" Value="llSay.lsl" /> |
| 97 | </Section> | 97 | </Section> |
| @@ -240,4 +240,4 @@ | |||
| 240 | <Key Name="fileName" Value="KanEd-Test16.lsl" /> | 240 | <Key Name="fileName" Value="KanEd-Test16.lsl" /> |
| 241 | </Section> | 241 | </Section> |
| 242 | 242 | ||
| 243 | </Nini> \ No newline at end of file | 243 | </Nini> |