ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-15 11:25:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
25,210 Commits 5 Branches 93 Tags
d00aa403e01e8401a8447955b2fc159a8644b9ce
Commit Graph

3084 Commits

Author SHA1 Message Date
UbitUmarov
d00aa403e0 Merge branch 'master' into ubitworkmaster 2014-09-09 02:05:44 +01:00
Melanie Thielker
e775e1a317 make PERMISSION_OVERRIDE_ANIMATIONS implicit for attachments 2014-09-09 03:03:27 +02:00
Melanie Thielker
f2390f7c72 Plumb llSetAnimationOverride 2014-09-09 03:01:05 +02:00
UbitUmarov
8e15d4ad57 limit number of prims on physical objects. Not all cases covered still 2014-09-08 23:58:49 +01:00
Melanie Thielker
22d472e34a Merge branch 'ubitworkmaster' 2014-08-11 18:45:39 +02:00
UbitUmarov
67a91ee314 make sensors detect sitting avatars also by the distance to the root prim 
of the object as sl does (as sl avatar needs to be in the arc)
 2014-08-10 22:13:39 +01:00
Melanie Thielker
4707c48828 LSL llListFindList fix: check types as well as content. Items must be same type 
to be found.
 2014-08-10 22:00:01 +02:00
UbitUmarov
c3b5a6c2ab change how sounds work. May be bad.. needs testing 2014-07-27 08:18:27 +01:00
Melanie Thielker
34c40a1e1a Remove some already commented lines 2014-07-20 23:58:16 +02:00
Melanie Thielker
c37a88d4f1 Fix LSL portions of sit positioning 2014-07-20 23:54:06 +02:00
UbitUmarov
dc717303d4 replace old Attachoffset by AttachedPos. Comented out possible merge 
artifacts
 2014-07-20 01:15:33 +01:00
Melanie Thielker
e1b2ecdfdc Merge branch 'avination-current' 
Conflicts:
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
 2014-07-19 22:32:07 +02:00
UbitUmarov
d5e0437465 fix Xengine script instance load 2014-07-18 11:43:31 +01:00
Melanie Thielker
159fcbf150 Merge branch 'master' of ssh://3dhosting.de/var/git/careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
 2014-06-21 00:39:55 +02:00
Melanie Thielker
527c2cdb1e Merge commit '68c8633ba18f0a11cfc0ed04d1d0c7c59e6cec76' 2014-06-21 00:23:11 +02:00
Melanie Thielker
d97896d39a Differentiate between requests only the owner should be able to do and those 
that managers can do when setting parcel data
 2014-04-26 20:32:27 +02:00
Melanie
c6e9db5866 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/RegionSettings.cs
	OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
	OpenSim/Region/Framework/Interfaces/IInterregionComms.cs
	OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
 2014-01-28 21:02:20 +00:00
Melanie
4ccb15290e Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2014-01-28 20:47:36 +00:00
Oren Hurvitz
2cf224166f Added osGetRegionSize(), which returns the region size in meters and recognizes megaregions 2014-01-28 00:11:50 +00:00
Justin Clark-Casey (justincc)
e9454d4672 Following on from 50ea2e0, only fetch scene presence for check if lightscript function has failed initial IsEstateManagerOrOwner() check 2014-01-18 01:36:40 +00:00
Oren Hurvitz
50ea2e0d67 Fixed: Windlight functions caused an error if called when the script's owner isn't in the scene 2014-01-18 01:26:30 +00:00
Justin Clark-Casey (justincc)
14c72d4a5b Revert "Fixed: Windlight functions caused an error if called when the script's owner isn't in the scene" 
This reverts commit 39e5785c0f.

Did not mean to apply this yet.
 2014-01-17 01:58:10 +00:00
Oren Hurvitz
39e5785c0f Fixed: Windlight functions caused an error if called when the script's owner isn't in the scene 2014-01-17 01:47:37 +00:00
David Rowe
08f2fc63cd Fixed llTextBox error message text 2014-01-10 20:43:24 +00:00
Melanie
e79fab91db Intermediate commit. Sill errors. 
Merge branch 'master' into careminster

Conflicts:
	OpenSim/Data/SQLite/SQLiteUserProfilesData.cs
	OpenSim/Framework/RegionInfo.cs
	OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
	OpenSim/Services/UserProfilesService/UserProfilesService.cs
 2014-01-05 20:12:32 +00:00
Justin Clark-Casey (justincc)
2f94165dcc Add lsl arg syntax checking for control event 2013-12-21 01:00:50 +00:00
Justin Clark-Casey (justincc)
f1cd813a29 refactor: rename internal lsl parser VectorDeclaration -> VecDeclaration for consistency 2013-12-21 00:49:01 +00:00
Justin Clark-Casey (justincc)
871ac5b16c Add arg checking for at_target lsl event 2013-12-21 00:46:34 +00:00
Justin Clark-Casey (justincc)
a5e4780547 Add lsl event arg checking for at_rot_target 2013-12-21 00:37:56 +00:00
Justin Clark-Casey (justincc)
b757ab2586 Add lsl event argument checking for attach and on_rez 2013-12-21 00:08:36 +00:00
Justin Clark-Casey (justincc)
51da52f904 Extend TestLlGetNotecardLine() regression test to contain chars that are two bytes in utf8 2013-12-14 02:48:29 +00:00
Eva Comaroski
63ccc3dbf5 Convert if-blocks to return statements in small functions such as GetStartParameter(). 2013-12-14 01:20:24 +00:00
Melanie
6d6b9ab791 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
 2013-12-07 01:08:49 +00:00
Justin Clark-Casey (justincc)
a64377149d Add parameter checking for land_collision, land_collision_start and land_collision_end lsl events 
Wrong number of parmeters now generates syntax error on compile, as seen on LL grid
 2013-11-29 00:44:53 +00:00
Melanie
3589acdab1 Merge branch 'master' into careminster 
Conflicts:
	.gitignore
	OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
	OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
	prebuild.xml
	runprebuild.bat
 2013-11-23 19:13:22 +00:00
Justin Clark-Casey (justincc)
f94d07f2e2 Add regression test to check that specifying a non-existent event raise a syntax error 
This was the case before any of the recent changes
 2013-11-16 03:02:57 +00:00
Justin Clark-Casey (justincc)
79c1ed8cb9 Add syntax checking for no_sensor() no-arg event 2013-11-16 03:00:03 +00:00
Justin Clark-Casey (justincc)
ec4d96acc9 refactor common code out of no argument LSL event regression tests 2013-11-16 02:58:06 +00:00
Justin Clark-Casey (justincc)
edd7e19463 If anything other than a single integer is specified for events that only take a single integer, generate a syntax error on LSL script compile rather than an exception later on. 
This applies to events changed, collision, collision_start, collision_end, on_rez, run_time_permissions, sensor, touch, touch_start, touch_end
 2013-11-16 02:50:14 +00:00
Justin Clark-Casey (justincc)
62006baaef Make state_exit, moving_end, moving_start, not_at_rot_target, not_at_target and timer LSL events generate a syntax error if inappropriately given arguments. 
This matches behaviour seen on the LL grid and a previous change for state_entry.
These are all the events which should take no arguments
 2013-11-16 01:30:23 +00:00
Justin Clark-Casey (justincc)
d728c1beb2 refactor LSL_EventTests.TestStateEntryEvent into single method to test compile 2013-11-16 01:25:25 +00:00
Justin Clark-Casey (justincc)
7cab41f422 refactor: replace verbose checks with String.IsNullOrEmpty where applicable. 
Thanks to Kira for this patch from http://opensimulator.org/mantis/view.php?id=6845
 2013-11-15 21:45:08 +00:00
Justin Clark-Casey (justincc)
fd24147afa Add initial test for checking that specifying a parameter in LSL state_entry() generates a syntax error. 
Same for other events to follow at a later date.
 2013-11-09 00:36:05 +00:00
Melanie
91b70bf3fe Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
 2013-11-08 17:55:01 +00:00
dahlia
0b4577d5b0 add support for particle glow LSL functions 2013-11-05 23:48:44 -08:00
dahlia
709814c194 add support for particle blending LSL functions 2013-11-05 23:38:43 -08:00
Melanie
ba203ed94f Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2013-11-03 21:34:36 +00:00
Justin Clark-Casey (justincc)
2b069a3b1e If the LSL state_entry() event definition contains any parameters, then generate syntax error as seen on the LL grid 
This is done through the parser and so generates the same syntax error message if any parameters are wrongly specified for this event.
We were already enforcing event names in the parser.
This is only for state_entry so far as an initial test of the approach - appears to work correctly.
 2013-11-02 00:39:12 +00:00
dahlia
cc73ef4eb9 add new particle system blending rule enumerations 2013-10-31 17:49:01 -07:00
dahlia
eb52d346c0 add new LSL constants associated with new "ribbon", "glow", and "blend" particle system functionality. Note that this does *not* complete required server side changes for implementing the new particle system 2013-10-31 16:13:03 -07:00