ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-17 20:25:34 +08:00
Code Issues Packages Projects Releases Wiki Activity
20,726 Commits 5 Branches 93 Tags
bc7fda39b496bb9fe45c96fd0df2a349ea3e5045
Commit Graph

1546 Commits

Author SHA1 Message Date
Justin Clark-Casey (justincc)
b2878eb773 Merge branch 'justincc-master' 2014-01-31 00:51:22 +00:00
David Rowe
1380b37d71 Made error messages more consistent 2014-01-31 00:24:52 +00:00
David Rowe
3d62f4369d Replaced throwing exceptions with calls to Error() 2014-01-31 00:24:47 +00:00
David Rowe
d405254971 Replaced llSay()ing LSL errors with calls Error() 2014-01-31 00:24:43 +00:00
David Rowe
9db4090c07 Replaced LSLError() calls with calls to Error() 2014-01-31 00:24:40 +00:00
David Rowe
c9550e473d Updated "deprecated" LSL errors to use Deprecrated() 2014-01-31 00:24:36 +00:00
David Rowe
257f9cec40 Updated "not implemented" LSL errors to use NotImplemented() 2014-01-31 00:24:31 +00:00
David Rowe
13bb9ea682 Updated ShoutError() calls to use new LSL error methods 2014-01-31 00:21:22 +00:00
David Rowe
67ec95bde8 Updated methods for handling LSL script errors, deprecated, and not implemented 2014-01-31 00:20:10 +00:00
Robert Adams
8eec717f5f Merge branch 'master' into varregion 2014-01-28 08:50:28 -08:00
Oren Hurvitz
2cf224166f Added osGetRegionSize(), which returns the region size in meters and recognizes megaregions 2014-01-28 00:11:50 +00:00
Robert Adams
f127e4b4ee Merge branch 'master' into varregion 2014-01-19 07:38:53 -08: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
Robert Adams
1cf17a3cf7 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)
 2014-01-11 08:52:23 -08:00
David Rowe
08f2fc63cd Fixed llTextBox error message text 2014-01-10 20:43:24 +00:00
Robert Adams
fd045d520e Merge branch 'master' into varregion 
Conflicts:
	OpenSim/Framework/Constants.cs
	OpenSim/Framework/RegionInfo.cs
	OpenSim/Services/GridService/GridService.cs
	OpenSim/Services/Interfaces/IGridService.cs
Most conflicts had to do with Util routines not in master branch yet.
 2014-01-04 08:57:51 -08:00
Robert Adams
2d2bea4aa7 varregion: many more updates removing the constant RegionSize and replacing 
with a passed region size. This time in the map code and grid services code.
 2013-12-26 22:45:59 -08: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
Robert Adams
6937eec258 Merge branch 'master' into varregion 
Add new region crossing code to varregion

Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
 2013-12-17 06:18:13 -08:00
Robert Adams
13a9a4b653 varregion: rename 'LegacyRegionLocX' back to 'RegionLocX' and same for Y and Z. 
Rename 'RegionWorldLocX' to 'WorldLocX' and same for Y and Z.
This keeps the downward compatibility and follows the scheme of 'region'
and 'world' location naming that is happening in the Util module.
 2013-12-14 07:53:01 -08: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
Robert Adams
31bacfbb63 Merge branch 'master' into varregion 2013-12-01 15:51:42 -08: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
Robert Adams
3193bcaae1 Merge branch 'master' into varregion 2013-11-24 07:23:12 -08: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
Robert Adams
604b39cea9 Merge branch 'master' into varregion 2013-11-15 14:56:13 -08: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
Robert Adams
7061784cc6 Merge branch 'master' into varregion 2013-11-08 20:55:28 -08:00
Robert Adams
beeec1c467 varregion: elimination of Constants.RegionSize from all over OpenSimulator. 
Routines in Util to compute region world coordinates from region coordinates
as well as the conversion to and from region handles. These routines have
replaced a lot of math scattered throughout the simulator.
Should be no functional changes.
 2013-11-08 20:53:37 -08: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
Robert Adams
f7bd0da026 Merge branch 'master' into varregion 2013-11-06 06:32:11 -08: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
Robert Adams
c931b16c1f Merge branch 'master' into varregion 2013-11-04 22:12:57 -08: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
Robert Adams
2be0347f50 Merge branch 'master' into varregion 2013-10-28 09:30:26 -07:00