diff options
| author | Robert Adams | 2014-01-11 08:52:23 -0800 |
|---|---|---|
| committer | Robert Adams | 2014-01-11 08:52:23 -0800 |
| commit | 1cf17a3cf7322b79d44ef80b9129c975f0cf4f6f (patch) | |
| tree | 125392101f83c8e7cb239848ae7a6cc12595b1a2 /bin/assets/ScriptsAssetSet | |
| parent | Merge branch 'master' into varregion (diff) | |
| parent | Fix crash in BulletSim which sometimes happens making a linkset physical (diff) | |
| download | opensim-SC-1cf17a3cf7322b79d44ef80b9129c975f0cf4f6f.zip opensim-SC-1cf17a3cf7322b79d44ef80b9129c975f0cf4f6f.tar.gz opensim-SC-1cf17a3cf7322b79d44ef80b9129c975f0cf4f6f.tar.bz2 opensim-SC-1cf17a3cf7322b79d44ef80b9129c975f0cf4f6f.tar.xz | |
Merge branch 'master' into varregion
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/SceneBase.cs
OpenSim/Services/Interfaces/IGridService.cs
OpenSim/Services/LLLoginService/LLLoginResponse.cs
(conflicts were debug statements that are commented out in master branch)
Diffstat (limited to 'bin/assets/ScriptsAssetSet')
| -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> |