ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-23 17:26:50 +08:00
Code Issues Packages Projects Releases Wiki Activity
25,448 Commits 5 Branches 93 Tags
4b066d373bebcaf89292e7aed0f6fbcff8325421
Commit Graph

1800 Commits

Author SHA1 Message Date
Melanie Thielker
97ff01a0c2 Taking a reference to the value collection is not thread safe. Change this 
to create a shallow copy instead and then iterate it's values to avoid the
"out of sync" error.
 2015-03-23 22:15:25 +01:00
Melanie Thielker
3a94e20d70 Merge branch 'ubitworkmaster' 2014-11-21 04:10:38 +01:00
Melanie Thielker
80118ac057 Remove braindead "fix" that messed up intersim scripted giving. 2014-11-21 04:00:52 +01:00
UbitUmarov
7bcb68d7c4 some steps to rez center or root of prim inventory object at requested 
position ( does nothing diferent still )
 2014-11-19 16:59:11 +00:00
UbitUmarov
07074d068b dont do recoil on llRezObject called from attachments, as seem to happen 
at sl
 2014-11-18 10:37:46 +00:00
UbitUmarov
140c0b3bb8 n llPushObject if pushed object is a avatar use its rotation, not pusher 
rotation
 2014-11-14 06:28:48 +00:00
UbitUmarov
f95bb53371 remove LockItemsForRead(false) without previus call with true 2014-09-21 23:02:02 +01:00
UbitUmarov
f66b58cf00 *TEST* add movement states SIT and SITGROUND. ScenePresence on SIT, 
SITGROUND or STAND, sets directly the state, and desired sitAnimation for
default sits
 2014-09-10 19:30:57 +01:00
UbitUmarov
724d174a77 it its a default ( internal ) animation return its name in lower case 2014-09-09 23:36:10 +01:00
UbitUmarov
13cb6ef6ef remove the check animState == anim for same reasons 2014-09-09 23:30:31 +01:00
UbitUmarov
4842806ea8 look for animation on part inventory before default animations, so 
user can use same name. Search directly on default animations using
 uppercase.
 2014-09-09 23:22:36 +01:00
Melanie Thielker
87a4abac50 Plumb the rest of the serverside AO 2014-09-09 20:50:41 +02:00
Melanie Thielker
2d2823f1de Add some case magic and send an anim pack when an override is set 2014-09-09 20:16:02 +02:00
UbitUmarov
46abe0c86d Merge branch 'master' into ubitworkmaster 2014-09-09 13:54:00 +01:00
Melanie Thielker
347c5b3070 Add perms check 2014-09-09 05:20:53 +02:00
Melanie Thielker
5376d0a97b Also check standard anim names 2014-09-09 03:31:04 +02:00
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
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
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
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)
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
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
dahlia
cc73ef4eb9 add new particle system blending rule enumerations 2013-10-31 17:49:01 -07:00
Kevin Cozens
84a149ecbf Call ScriptSleep() instead of llSleep() in routine for llEmail. 
Signed-off-by: teravus <teravus@gmail.com>
 2013-10-18 14:30:05 -05:00
Oren Hurvitz
d0c1780839 Fixed rezzing coalesced objects from a prim's inventory 
Previously only the first object in the Coalesced Object was rezzed. Now all the objects are rezzed.
 2013-10-15 23:59:16 +01:00
Melanie
69054ad134 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/Servers/VersionInfo.cs
	OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
 2013-10-06 18:32:20 +01:00
Justin Clark-Casey (justincc)
42bdf44658 Bump OPenSimulator version and assembly versions up to 0.8.0 Dev 2013-10-04 23:33:47 +01:00
Melanie
75c68fa29e Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Data/MySQL/MySQLSimulationData.cs
	OpenSim/Data/MySQL/Resources/RegionStore.migrations
	OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
	OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
	OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCapabilityTests.cs
	OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2013-10-04 20:03:12 +01:00
Justin Clark-Casey (justincc)
b16bc7b01c refactor: rename Scene.IncomingCloseAgent() to CloseAgent() in order to make it clear that all non-clientstack callers should be using this rather than RemoveClient() in order to step through the ScenePresence state machine properly. 
Adds IScene.CloseAgent() to replace RemoveClient()
 2013-09-27 19:14:21 +01:00