ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-25 19:25:41 +08:00
Code Issues Packages Projects Releases Wiki Activity
21,565 Commits 5 Branches 93 Tags
f3f794a12292e2abfdaecaa68b87663f27619277
Commit Graph

2729 Commits

Author SHA1 Message Date
Melanie
f3f794a122 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2012-10-26 21:47:41 +01:00
Melanie
1c5f6e48b8 Separate LSL's notion of the default anim from the actually playing anims. 2012-10-26 21:23:20 +01:00
Melanie
26cc57b6ca Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
 2012-10-26 21:13:01 +01:00
SignpostMarv
e977761071 adding ability for listeners to be filtered by regular expressions and a general-purpose function to see if a given string matches a given regex 2012-10-26 02:08:00 +01:00
SignpostMarv
18b1ee6f37 Formatting and casing correction in WorldCommModule, trailing new line in OSSL to get git diff to not complain 2012-10-26 02:08:00 +01:00
Justin Clark-Casey (justincc)
1b3b7a61ac minor: Add comment as to why we are pulcking plain old ints out of the LSL_List when converting values from LSL for modInvoke() 2012-10-26 01:50:46 +01:00
SignpostMarv
ecdb88679e Removing the apparently superfluous explicit namespace reference so that the if-else-if-else block in ConvertFromLSL can have a consistent appearance 2012-10-26 01:43:54 +01:00
SignpostMarv
01972cc9e8 system ints can end up in LSL lists, which can cause counter-intuitive unknown list element type errors in ConvertFromLSL (via modInvoke) 2012-10-26 01:43:53 +01:00
Justin Clark-Casey (justincc)
8af8319b95 Get osNpcCreate() and osNpcLoadAppearance() to generate a script error if appearance notecard does not exist, rather than returning UUID.Zero or silently failing. 2012-10-25 03:02:00 +01:00
Justin Clark-Casey (justincc)
d9aaf51561 When scripts generate expected exceptions (e.g. due to checked bad parameter) throw ScriptException instead of just a plain old exception. 
This is to make it easier to distinguish these exceptions from unexpected OpenSimulator problems internally and in regression tests.
No functional changes.
 2012-10-25 02:52:20 +01:00
Justin Clark-Casey (justincc)
ae662b54ea Make osNpcCreate() return UUID.Zero instead of throwing an exception if notecard name is invalid. Make osNpcLoadAppearance() fail silently in same circumstance rather than throwing exception. 2012-10-25 01:07:06 +01:00
Justin Clark-Casey (justincc)
5d4ac5a90f Add TestOsNpcLoadAppearance() 2012-10-25 00:59:27 +01:00
Justin Clark-Casey (justincc)
1743fe5d62 Move npc creation tests involving appearance from OSSL_ApiAppearanceTest to OSSL_ApiNpcTests 
This is a more intuitive location.
 2012-10-25 00:29:50 +01:00
Melanie
13cef0b16a Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/LandData.cs
 2012-10-23 17:23:36 +01:00
BlueWall
2aac113ac1 Add CLICK_ACTION_ZOOM 
Add support for V2/3 CLICK_ACTION_ZOOM to llSetClickAction
 2012-10-20 04:32:04 -04:00
Melanie
6ad8d3c43f Merge branch 'master' into careminster 2012-10-20 02:33:24 +01:00
SignpostMarv
af5383e479 altering documentation for llGetLinkName, as the current documentation is rather lengthy for a "summary". 2012-10-19 02:48:59 +01:00
SignpostMarv
645e3171b4 since llGetLinkName has a "simplest case", it should be the first check made. 2012-10-19 02:48:59 +01:00
SignpostMarv
597df51f91 the simplest case for llGetLinkName also applies to the LINK_THIS constant 2012-10-19 02:48:59 +01:00
SignpostMarv
ec044537d5 ensuring that operand order in llGetLinkName is internally consistent 2012-10-19 02:48:59 +01:00
Melanie
416bc19da7 Merge branch 'avination' into careminster 2012-10-17 00:13:49 +01:00
Melanie
fa52effb27 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs
 2012-10-16 04:30:01 +01:00
Justin Clark-Casey (justincc)
ab0294f010 Add missing category paremeter to llGiveInventoryList grid IM construction. 
This was a regression from 16c9c1df Sat Oct 6 02:34:49 2012 +0100.
Should resolve http://opensimulator.org/mantis/view.php?id=6360
 2012-10-16 01:33:35 +01:00
Melanie
ce26730d4e Allow bypassing perms dialog (console only) 2012-10-14 17:31:29 +02:00
Justin Clark-Casey (justincc)
330b976a62 Improve on TBG Renfold's fix to llRequestSimulatorData DATA_SIM_POS by only performing HG regionflags service check if the region secret is not empty. 
An empty RegionSecret is never HG, whilst a non-empty one may be HG or being genuinely used as a RegionSecret.
 2012-10-13 01:03:09 +01:00
TBG Renfold
f6e166cd0b Now using region flags for llRequestSimulatorData DATA_SIM_POS. 
If the region is not classed a hypergrid region, then the region secret is checked to make sure that it is a valid UUID.

Just a temporary fix at this time.
 2012-10-13 00:50:34 +01:00
Melanie
6ce93b22d1 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
 2012-10-12 19:05:06 +01:00
Justin Clark-Casey (justincc)
756ac4f321 Correct osSetContentType() threat check to query osSetContentType rather than osSetResponseType 2012-10-10 01:39:47 +01:00
Justin Clark-Casey (justincc)
11d8119a21 Remove osDropAttachment threat level check wrongly placed in OSSL_Api.ShoutErrorOnLackingOwnerPerms. 2012-10-10 01:37:57 +01:00
Melanie
f7df68d922 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
	OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
 2012-10-07 02:48:28 +01:00
Justin Clark-Casey (justincc)
16c9c1dff7 On receiving TaskInventoryAccepted with a destination folder in the binary bucket slot for RLV, notify the viewer about inventory folder updates. 
The viewer would not see the folder move without this, either on accept or decline.
This commit also updates the TaskInventoryOffered message to better conform with the data LL uses
Changes are, agentID is prim owner rather than prim id, agent name is now simply object name rather than name with owner detail,
message is just folder name in single quotes, message is not timestamped.
However, folder is not renamed "still #RLV/~<name>".  Long term solution is probably not to do these operations server-side.
Notes will be added to http://opensimulator.org/mantis/view.php?id=6311
 2012-10-06 02:34:49 +01:00
Melanie
bf565e9747 Merge branch 'avination' into careminster 
Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2012-10-03 17:40:11 +01:00
Melanie
653a98e891 Fix a viewer crash issue 
Conflicts:

	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2012-10-03 17:39:13 +01:00
Melanie
fdacb88b29 Fix a viewer crash issue 2012-10-03 17:11:02 +02:00
Melanie
23d5bafa7f Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
 2012-10-03 00:24:33 +01:00
SignpostMarv
a1679517d3 correcting typo 2012-10-02 22:14:47 +01:00
SignpostMarv
f555febdb7 taking into account the recent introduction of implicit operators 2012-10-02 22:14:46 +01:00
SignpostMarv
ce7694c108 added perms checking, duplicated functionality to methods that do not require perms and have higher threat level 2012-10-02 22:14:46 +01:00
SignpostMarv
c677c04f10 fixing copypasta 2012-10-02 22:14:46 +01:00
SignpostMarv
35b7c80e0b implementing osDropAttachment & osDropAttachmentAt 2012-10-02 22:14:46 +01:00
Melanie
54ec8b197b Add money event routing to the script engine. 2012-10-02 01:25:55 +01:00
Melanie
14b659e550 Send money() events to the clicked prim. Reverting a change I made over a year ago. 2012-10-02 01:17:46 +01:00
Melanie
944b1ed237 Merge branch 'avination' into careminster 2012-09-29 21:47:08 +01:00
Melanie
f05ca1a0fe Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-09-28 00:15:58 +02:00
Melanie
7e21ddeeff Fix a possible NRE 2012-09-28 00:15:14 +02:00
Melanie
001ec0e2e6 Merge branch 'avination' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
 2012-09-27 17:29:44 +01:00
Melanie
2998a2df6a Streamline and improve llGetMass 2012-09-26 22:30:09 +02:00
Melanie
bbaf2c5a80 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
 2012-09-24 20:14:00 +01:00
Justin Clark-Casey (justincc)
5df3944607 Fix llListFindList() returning no match when there is a match with a script constant component in the source list. 
Adds regression test for this case.
Based on http://opensimulator.org/mantis/view.php?id=6156
Thanks SignpostMarv.
 2012-09-22 00:23:25 +01:00
Melanie
21c476228a Merge branch 'avination' into careminster 2012-09-10 13:53:00 +01:00