ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-06-01 15:27:14 +08:00
Code Issues Packages Projects Releases Wiki Activity
20,818 Commits 5 Branches 93 Tags
a79bafaaaf3df2a0e1663bf9317ee53eb06db204
Commit Graph

1793 Commits

Author SHA1 Message Date
Melanie
b7237ef059 Merge commit '62a63f834b7cc056ee37c396034d0e268f66b4a8' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
 2011-10-25 02:35:33 +01:00
Melanie
5c09cffe55 Merge commit '79c13cd99728f09a5175dff1750dcb9d7790fcdc' into bigmerge 2011-10-25 02:27:35 +01:00
Melanie
496c647ab5 Merge commit 'de161585c0960a93911f446f0179441ba5470245' into bigmerge 2011-10-25 02:27:26 +01:00
Melanie
e2de57ca29 Merge commit '0c041ce12f393367e2754e88d9b8dad5e45f88c4' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
 2011-10-25 02:26:56 +01:00
Melanie
9ceb98344a Merge commit '631d5e16ef8c5340b6283b1a9ed9cc95aea3e3a1' into bigmerge 2011-10-25 01:37:11 +01:00
Melanie
8e69dde397 Merge commit 'ea7366ddc6f0e13519589fcaa3729fd36b5eef79' into bigmerge 
Conflicts:
	OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
 2011-10-25 01:36:39 +01:00
BlueWall
3fc47275cf Add case to Lightshare/Windlight 
Thanks thomax for a patch to add handling for Sun/Moon pos.
 2011-10-22 13:06:34 -04:00
Dan Lake
da794f34a5 Renamed and rearranged AvatarFactoryModule to eliminate redundant lookups of scene presence by client ID. 2011-10-19 14:41:44 -07:00
Justin Clark-Casey (justincc)
5607fd3af8 Fix resume scripts. 
On resume, we need to place requeue the script for event processing if there are any events on the queue.
Also need to do this under m_Script lock in order to avoid a race
 2011-10-19 21:30:37 +01:00
Justin Clark-Casey (justincc)
3cf7fb4eca Add "scripts suspend" and "scripts resume" commands. 
These aim currently to suspend and resume all scripts.
However, resume isn't currently working due to what looks like a bug in resume functionality itself.
 2011-10-19 20:53:24 +01:00
Justin Clark-Casey (justincc)
116fbe8258 add current script status to "scripts show" command (running, suspended, etc.) 2011-10-19 20:24:07 +01:00
Justin Clark-Casey (justincc)
ecad9f9fd5 Add "show scripts" command to show all scripts currently known to the script engine in the current region. 
Also added synonym of "scripts show"
 2011-10-19 20:09:02 +01:00
Justin Clark-Casey (justincc)
62a63f834b refactor: Use SOP.SitTargetAvatar instead of calling a special GetAvatarOnSitTarget() which returned exactly the same thing 2011-10-17 02:04:20 +01:00
Justin Clark-Casey (justincc)
79c13cd997 rename OS_NPC_SIT_IMMEDIATE to OS_NPC_SIT_NOW since it's shorter and more understandable 
This makes something like osNpcSit(npc, llGetKey(), OS_NPC_IMMEDIATE) now become
osNpcSit(npc, llGetKey(), OS_NPC_SIT_NOW);
This is why it's in development :)
 2011-10-17 01:57:23 +01:00
Justin Clark-Casey (justincc)
de161585c0 Implement osNpcStand(<npc-id>) 
Allows you to stand an NPC that has sat.
 2011-10-17 01:56:25 +01:00
Justin Clark-Casey (justincc)
0c041ce12f Implement osNpcSit(). This is still in development so don't trust it 
Format is osNpcSit(<npc-uuid>, <target-uuid>, OS_NPC_SIT_IMMEDIATE)
e.g. osNpcSit(npc, llGetKey(), OS_NPC_SIT_IMMEDIATE);
At the moment, sit only succeeds if the part has a sit target set.
NPC immediately sits on the target even if miles away - they do not walk up to it.
This method is in development - it may change so please don't trust it yet.
Standing will follow shortly since that's kind of important once you're sitting :)
 2011-10-17 01:42:31 +01:00
Justin Clark-Casey (justincc)
631d5e16ef Get rid of some traces of the old pre-ROBUST grid architecture config 2011-10-12 21:51:34 +01:00
Justin Clark-Casey (justincc)
ea7366ddc6 When shutting down XEngine, log how many scripts are being shutdown so the user knows why they are waiting. 2011-10-12 19:42:04 +01:00
Melanie
816d0de11a Merge commit '28f549bd64eb423ae43a5c23c1da5094e6269150' into bigmerge 2011-10-12 07:24:46 +01:00
Melanie
cc637b78fb Merge commit '19096bd391ac88bbccda00e4660a061020118bb9' into bigmerge 2011-10-12 07:24:13 +01:00
Melanie
98ae98510c Merge commit '2b290793ab7153c956db5637dd27dfbbd0a1cf98' into bigmerge 2011-10-12 07:23:40 +01:00
Melanie
e4f3ba8610 Merge commit '92c88121c72386f85472c6cf4891eca8b62b9867' into bigmerge 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
 2011-10-12 00:10:30 +01:00
Melanie
a9af618842 Merge commit '460946ad62b682c7a942751f192ca9e96b662f0e' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2011-10-11 23:32:16 +01:00
Melanie
0b96991ab4 Merge commit 'c7d0d71666a92b201d639511d062a7c22726b3c9' into bigmerge 2011-10-11 23:28:16 +01:00
Melanie
1ca86114e1 Merge commit 'a8af0a5ba873dbb8c447e16b142ba7f5af715bdb' into bigmerge 2011-10-11 23:22:23 +01:00
Melanie
3359bafc3e Merge commit '8a6e6866d9c6c60e4a2e4b980ca2e35ae3963d0d' into bigmerge 2011-10-11 23:22:08 +01:00
Melanie
efaa113fb9 Merge commit 'c7db3df3442657cda398ff2f90d387bce98c718a' into bigmerge 2011-10-11 23:15:41 +01:00
Melanie
61a8e35b7d Merge commit '528fcede6c31c056c3863fd19528558fcbaf475f' into bigmerge 2011-10-11 23:08:38 +01:00
Melanie
6978ae0a59 Merge commit 'b2356340d22578143af2daab979ea4633faa93dc' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
 2011-10-11 22:11:44 +01:00
Melanie
cc1fe354d0 Merge commit 'de19dc3024e5359f594d0a32c593d905163c24ea' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
 2011-10-11 21:21:44 +01:00
Pixel Tomsen
28f549bd64 osSetParcelDetails - PARCEL_DETAILS_CLAIMDATE 
this new flag set parcels claim date
value 0 for this flag set current unixstamp

http://opensimulator.org/mantis/view.php?id=5725
 2011-10-11 00:13:26 +01:00
Justin Clark-Casey (justincc)
19096bd391 Convert getLastReportedSimFPS() and getLastReportedSimStats() into more idiomatic LastReportedSimFPS and LastReportedSimStats on SimStatsReporter 2011-10-10 22:23:42 +01:00
Justin Clark-Casey (justincc)
2b290793ab refactor: have lsl and ossl interrogate scene.StatsReporter directly rather than going through scene 
I know this goes against the law of demeter but I don't think it's that useful here and I'd rather get rid of nasty little wrapper methods
 2011-10-10 21:54:08 +01:00
Dan Lake
92c88121c7 Removed all refs to IClientAPI from IAttachmentsModule. Separated client handlers for attachments to call public interface and rearranged module file into sections 2011-10-04 14:40:39 -07:00
Dan Lake
bfa405e6f7 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2011-10-03 16:45:04 -07:00
Dan Lake
460946ad62 Removed redundant code in AttachmentsModule and simplified interfaces which converted back and forth between ScenePresence and IClientAPI. More to be done still. 2011-10-03 16:44:32 -07:00
Justin Clark-Casey (justincc)
c7d0d71666 trival tweak to trigger the continuous integration system 2011-10-04 00:37:02 +01:00
Justin Clark-Casey (justincc)
a8af0a5ba8 Return NULL_KEY from llGetTexture if a non-existent face is indicated, rather than "" 
As per http://wiki.secondlife.com/wiki/LlGetTexture
 2011-10-04 00:15:48 +01:00
Justin Clark-Casey (justincc)
8a6e6866d9 For llGetTexture(), if the face texture asset is in the inventory, return the inventory name rather than the asset UUID 
This is as per http://wiki.secondlife.com/wiki/LlGetTexture
Applied patch in http://opensimulator.org/mantis/view.php?id=4552 with an additional break statement if an inventory item is found to exit early.
Thanks Michelle Argus!
 2011-10-04 00:07:52 +01:00
Pixel Tomsen
c7db3df344 llGetLinkKey, llGetLinkName Fix for sitting Avatar 
when an avatar sits on a prim, we get now his key & name ;-)

http://opensimulator.org/mantis/view.php?id=4476
 2011-10-01 00:41:47 +01:00
Pixel Tomsen
528fcede6c llAvatarOnLinkSitTarget Implementation 
http://wiki.secondlife.com/wiki/LlAvatarOnLinkSitTarget
 2011-09-29 01:08:05 +01:00
Justin Clark-Casey (justincc)
de19dc3024 refactor: rename SOG/SOP.GetProperties() to SendPropertiesToClient() to reflect what it actually does 
This also makes it consistent with some other methods that send data to the client.
 2011-09-15 18:58:58 +01:00
Tom
5484c9b585 Bring us up to date. 2011-09-14 19:11:32 -07:00
Tom
cda4cd6b55 Merge fixes, and fix the build 2011-09-14 18:46:42 -07:00
Micheil Merlin
28961dd1cf llSetPrimitiveParams Prim type params precision errors 2011-09-09 22:53:45 +01:00
Justin Clark-Casey (justincc)
08bd16285d When invoking any of the OSSL teleport functions, do it on a separate thread rather than the script thread. 
This is to prevent the aborting of attachment script threads on teleport from aborting the one actually doing the teleport.
This allows OSSL teleport functions to work when invoked on scripts in attachments (and huds, I assume)
 2011-09-07 23:55:41 +01:00
Tom
03f6734f43 First set of merge fixes 2011-09-07 09:42:18 -07:00
Tom
66dec3b874 Resolve merge commits, stage 1 2011-09-04 07:06:36 -07:00
Justin Clark-Casey (justincc)
c491cdcb95 refactor: use SOG register target waypoints and rots directly instead of calling through the SOP, which doesn't make conceptual sense anyway. 2011-09-01 02:18:31 +01:00
Justin Clark-Casey (justincc)
7eca929686 Eliminate pointless checks of SOG.RootPart != null 
It's never possible for SOG to have no RootPart, except in the first few picosends of the big bang when it's pulled from region persistence or deserialized
 2011-09-01 02:11:00 +01:00