ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-24 10:55:35 +08:00
Code Issues Packages Projects Releases Wiki Activity
15,430 Commits 5 Branches 93 Tags
e5ef993f2b7ee8b7777d8a413d815c3e8e2ca786
Commit Graph

162 Commits

Author SHA1 Message Date
Melanie
69c1e0b2f7 Merge branch 'master' into careminster-presence-refactor 2010-10-29 21:22:35 +01:00
Melanie
9331898c32 Merge branch 'master' into careminster-presence-refactor 2010-10-29 20:40:48 +01:00
Master ScienceSim
f2c1d0e34f Merge branch 'opensim-master' into dev-appearance 2010-10-28 09:09:42 -07:00
Jeff Ames
727838f914 Formatting cleanup. 2010-10-28 00:37:32 -04:00
Melanie
05dbe4f2c4 Merge branch 'master' into careminster-presence-refactor 2010-10-27 20:49:27 +01:00
Jeff Ames
a331fd4e24 Formatting cleanup. 2010-10-27 00:01:03 -04:00
Master ScienceSim
267f18925d First attempt to get multiple attachments working to support viewer2. 
The attachment code appears to work correctly for 1.23 viewers so, in
spite of some big changes in the internal representation, there don't
appear to be regressions. That being said, I still can't get a viewer2
avatar to show correctly.
 2010-10-21 16:48:58 -07:00
Melanie
7df4383235 Merge branch 'master' into careminster-presence-refactor 
Integrate the next large patch.
Don't use this version, it has a ghost avatar issue. Next push
will fix it.
 2010-09-17 03:49:30 +01:00
John Hurliman
860b2a502f Changed SceneObjectGroup to store parts with the fast and thread-safe MapAndArray collection 2010-09-16 17:30:46 -07:00
Melanie
6a1ce17cdb Merge branch 'master' into careminster-presence-refactor 
The modules will need to be updated for this to compile and run again. Please
don't use until I do the companion commit to modules later on.
 2010-09-13 16:17:38 +01:00
Jeff Ames
f1f0bc23f4 Formatting cleanup. 2010-09-12 13:43:49 -04:00
John Hurliman
dd277a0d02 First pass at cleaning up thread safety in EntityManager and SceneGraph 2010-09-10 12:04:12 -07:00
Melanie
3284356bba Merge branch 'master' into careminster-presence-refactor 2010-09-07 01:48:00 +01:00
Justin Clark-Casey (justincc)
ab875b32c1 Make console backup command do a forced backup rather than non-forced 
Remove no-arg backup method for simplicity as it only make sense to call non-forced backup internally
 2010-09-06 23:12:03 +01:00
Melanie
79bfa275da Merge branch 'master' into careminster-presence-refactor 2010-08-30 02:30:28 +01:00
Justin Clark-Casey (justincc)
1c0b4457cd Improve liveness by operating on list copies of SOG.Children where appropriate 2010-08-28 00:40:33 +01:00
Justin Clark-Casey (justincc)
8031f8ec09 Improve consistency of locking for SOG.m_parts in order to avoid race conditions in linking and unlinking 2010-08-26 00:08:53 +01:00
Melanie
fc8d2be632 Merge branch 'master' into careminster-presence-refactor 
This was rather conflicted. Please test linking.
 2010-08-26 00:11:07 +01:00
Tom
d2d56494b2 Fix the XmlRpcRouterModule so it reads from the correct config section ([XMLRPC] not [Startup]) and disable by default (since it's disabled in the ini by default) 2010-08-01 10:24:43 -07:00
Tom
763dc8bb76 Add an m_enabled flag to XmlRpcRouterModule so it won't try to bind the xmlrpc_uri event if it's not mentioned in the ini. 2010-08-01 10:24:17 -07:00
Melanie Thielker
bbb4d6e4c9 Fix a nullref in EventManager caused by RegionReady not setting the scene 2010-05-31 01:02:04 +02:00
Melanie Thielker
8df9f272eb Fix a nullref in EventManager caused by RegionReady not setting the scene 2010-05-30 23:57:13 +01:00
Justin Clark-Casey (justincc)
b2197e3b94 Apply http://opensimulator.org/mantis/view.php?id=4632 
Adds dialog methods for MRM.
Thanks ziah.
 2010-05-21 23:37:05 +01:00
Justin Clark-Casey (justincc)
074937e0e5 Apply http://opensimulator.org/mantis/view.php?id=4627 
Adds OwnerId and CreatorId properties to MRM.IObject
 2010-05-21 23:34:47 +01:00
unknown
fb7458be31 Minor spelling corrections in MiniModule: "RetreiveAsset" changed to 
"RetrieveAsset" and 'm_rootSceene' to m_rootScene'.
 2010-04-28 11:47:07 +03:00
John Hurliman
df76e95aa2 Changed asset CreatorID to a string 2010-02-22 14:18:59 -08:00
John Hurliman
71c6559a91 Merge branch 'presence-refactor' of ssh://opensimulator.org/var/git/opensim into presence-refactor 2010-02-22 14:10:19 -08:00
John Hurliman
7665aad002 * Adds CreatorID to asset metadata. This is just the plumbing to support CreatorID, it doesn't modify database backends or OAR files to support storing/loading it 2010-02-22 13:27:17 -08:00
Melanie
1f45e6c649 Merge branch 'master' into presence-refactor 
This brings presence-refactor up to master again
 2010-02-22 03:00:59 +00:00
Justin Clark-Casey (justincc)
68b494b2cc Apply http://opensimulator.org/mantis/view.php?id=4495 
Adds IsChildAgent property to IAvatar in MRM.
Thanks ziah
 2010-02-19 22:44:33 +00:00
Melanie
c033223c63 Merge branch 'master' into presence-refactor 2010-02-15 00:20:48 +00:00
Revolution
9821c4f566 Revolution is on the roll again! :) 
Fixes: Undo, T-pose of others on login, modifiedBulletX works again, feet now stand on the ground instead of in the ground, adds checks to CombatModule. Adds: Redo, Land Undo, checks to agentUpdate (so one can not fall off of a region), more vehicle parts. Finishes almost all of LSL (1 function left, 2 events).

Direct flames and kudos to Revolution, please

Signed-off-by: Melanie <melanie@t-data.com>
 2010-02-14 22:18:46 +00:00
Melanie
baaf660511 Merge branch 'master' into presence-refactor 
This was a large, heavily conflicted merge and things MAY have got broken.
Please check!
 2010-02-08 15:53:38 +00:00
Justin Clark-Casey (justincc)
4c1365f149 apply http://opensimulator.org/mantis/view.php?id=4486 
fix compilation of mrm scripts using microthreaded parmeter
Thanks ziah
 2010-01-30 00:15:37 +00:00
Melanie
a87a247f05 Revert "Updates all IRegionModules to the new style region modules." 
This reverts commit ec3c31e61e.
 2010-01-29 07:21:06 +00:00
Revolution
ec3c31e61e Updates all IRegionModules to the new style region modules. 
Signed-off-by: Melanie <melanie@t-data.com>
 2010-01-23 15:18:52 +00:00
Diva Canto
e31131b40f Some typos fixed related to master avie removal 2010-01-10 15:41:49 -08:00
Melanie
3c90d834ea Remove all references to master avatar, replacing with estate owner where 
appropriate. This changes the behavior of the REST plugins and RemoteAdmin's
region creation process.
 2010-01-10 22:41:42 +00:00
Jeff Ames
70d5b1c34c Formatting cleanup. Add copyright headers. 2010-01-04 06:17:30 +09:00
Charles Krinke
fddefff284 Thank you kindly, Ziah for a patch that adds the channel to the class ChatEventArgs and retrieves it's value along with the others from the OSChatMessage in HandleChatPackage. With this the MRM Script can check if a ChatEvent is coming in on a specifc Channel. The Second Part adds the Method say(string msg , int channel) to send a chat message on the specified channel. The idea behind this is to enable MRM's to communicate with regular LSL or OSSL Scripts so that they may can act as a Backend to access a Database or do business Logic for those Scripts. 
Signed-off-by: Charles Krinke <cfk@pacbell.net>
 2009-12-23 10:34:11 -08:00
Melanie
de59910758 Patch from Ziah. 
Mantis #4456: Patch to implement some minor MRM Functions : SitTarget,
SitTargetText, TouchText and Text
 2009-12-21 14:46:07 +00:00
Justin Clark-Casey (justincc)
ee0b5abc62 minor: reduce region ready logging verbosity 2009-11-26 16:51:10 +00:00
Melanie
ba99081bbe Add IScriptModuleComms interface and region module to handle dispatch of 
script messages to region modules and sending back replies.
Hook IScriptModuleComms.OnScriptCommand to see commands and use
DispatchReply to reply to the script. It is recommended to pass the "id"
parameter from the event as the "k" parameter of the reply.
The script will receive the reply as a link message from link -1.
 2009-11-10 03:36:43 +00:00
John Hurliman
afef1ac191 Changing the AssetBase constructors to avoid initializing assets with an unknown asset type, and log an error if it ever does happen 2009-11-05 13:10:58 -08:00
John Hurliman
d199767e69 Experimental change of PhysicsVector to Vector3. Untested 2009-10-26 18:23:43 -07:00
John Hurliman
d44b50ee46 * Removed some of the redundant broadcast functions in Scene and SceneGraph so it is clear who/what the broadcast is going to each time 
* Removed two redundant parameters from SceneObjectPart
* Changed some code in terse update sending that was meant to work with references to work with value types (since Vector3 and Quaternion are structs)
* Committing a preview of a new method for sending object updates efficiently (all commented out for now)
 2009-10-15 15:25:02 -07:00
dr scofield (aka dirk husemann)
2107b67f1b - cleaning up LandData/ILandObject capitalization issues 
- adding LandDataSerializer to OAR mechanics
 2009-10-02 11:31:30 +02:00
Jeff Ames
ee205e7e81 Formatting cleanup. 2009-10-01 01:17:47 +09:00
dr scofield (aka dirk husemann)
ef6c0bd7d8 cleanup. 2009-09-01 10:28:29 +02:00
dr scofield (aka dirk husemann)
3195af39a7 cleaning up RegionReadyModule: 
- wrong namespace
- converted to "new" region module
 2009-08-31 14:59:28 +02:00