Commit Graph

12619 Commits (49efec2ef17ece206f73acf1665bf973a6204b87)

Author SHA1 Message Date
John Hurliman 8556a9f1a8 Applying patch #4534 by Misterblue to fix ODE physics stickiness 2010-02-04 13:31:06 -08:00
Melanie 776d62b9c6 Merge branch 'master' into careminster 2010-02-04 17:29:33 +00:00
Melanie 2953bee1f4 Revert "change position of OnAttach event firing so that this also happens when a user teleports into a region"
The behavior introduced here is not compatible with SL

This reverts commit b6bee4999c.
2010-02-04 17:11:06 +00:00
Melanie ae9362636e Line endings cleanup 2010-02-04 17:00:16 +00:00
Melanie 0ab8dd61d7 Finally cutting the gordian knot. Friends needs to be both a module and a
service, and never the twain shall meet. This finally opens up the path to
a working friends implementation
2010-02-04 12:21:14 +00:00
Melanie f9a61f2825 Some interface and data structure changes, add the missing method in friends 2010-02-04 10:51:36 +00:00
Justin Clark-Casey (justincc) b9c3846e81 minor: remove some mono compiler warnings 2010-02-03 22:19:28 +00:00
Justin Clark-Casey (justincc) b1dfcccc9a Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim 2010-02-03 22:14:58 +00:00
Kitto Flora 48134af616 Motor angular decay fix. 2010-02-03 16:20:13 -05:00
Justin Clark-Casey (justincc) bde7f361fa minor: remove one mono compiler warning 2010-02-03 19:46:33 +00:00
Justin Clark-Casey (justincc) 7c69badd3d minor: remove one mono compiler warning 2010-02-03 19:34:08 +00:00
Kitto Flora fc1ac25935 Merge branch 'master' of ssh://3dhosting.de/var/git/careminster 2010-02-03 14:32:29 -05:00
Justin Clark-Casey (justincc) 2c7672a2b9 minor: add a smidgen of EventManager doc 2010-02-03 19:27:44 +00:00
Justin Clark-Casey (justincc) 1442ab08aa minor: remove one mono compiler warning 2010-02-03 19:08:02 +00:00
Justin Clark-Casey (justincc) cd4651041e For each delegate added to events in the EventManager, catch and log but do not propogate any exceptions that come back
This stops exceptions thrown by modules from disrupting the kernel and still allows other delegates to be executed normally
2010-02-03 19:04:31 +00:00
Justin Clark-Casey (justincc) daa66c4811 add an IsRoot property to sop 2010-02-03 16:40:21 +00:00
Justin Clark-Casey (justincc) c020fed1b8 minor: comment out a log line in ScenePresence 2010-02-03 15:46:24 +00:00
Justin Clark-Casey (justincc) da62344822 minor: remove a couple of mono warnings 2010-02-03 15:40:59 +00:00
Justin Clark-Casey (justincc) b6bee4999c change position of OnAttach event firing so that this also happens when a user teleports into a region 2010-02-03 15:35:41 +00:00
Diva Canto 11ed5dee3b Commenting UserAgentService.VerifyClient(UUID sessionID, string token) for now until I understand better the client IP issue. 2010-02-02 19:41:46 -08:00
Diva Canto b517eb6d3a Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/opensim into presence-refactor 2010-02-02 16:55:32 -08:00
Diva Canto df3ab04e0c Removed useless config. 2010-02-02 16:54:55 -08:00
Diva Canto 80bb540702 Removed useless config. 2010-02-02 16:28:41 -08:00
Melanie 0f1a3f8ed2 Merge branch 'master' into careminster 2010-02-03 00:16:02 +00:00
Melanie fa121951d2 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-02-03 00:15:14 +00:00
radams1 88d0fc3b09 allow terrain collision events after regular collision check
Signed-off-by: Melanie <melanie@t-data.com>
2010-02-03 00:15:04 +00:00
Justin Clark-Casey (justincc) bbd41de6d5 refactor: move world comm message queueing into its own method 2010-02-02 20:38:58 +00:00
Justin Clark-Casey (justincc) 0faeaf98a6 minor: copy some method doc from the WorldComm implementation to the interface 2010-02-02 19:42:45 +00:00
Justin Clark-Casey (justincc) dc82409106 minor: add method doc to sop.SetScriptEvents() 2010-02-02 19:04:06 +00:00
Kitto Flora 8c20610293 AngMotor update 1 2010-02-02 13:28:42 -05:00
Justin Clark-Casey (justincc) 0e23c5fffb minor: add some documentation to EventManager.OnObjectGrab 2010-02-02 18:19:15 +00:00
Justin Clark-Casey (justincc) 96d5c8196a minor: add reminder to lock SOG.Children before using it directly in order to avoid threading issues 2010-02-02 15:45:41 +00:00
Melanie d5ed92cf38 Merge branch 'master' into careminster 2010-02-02 03:56:29 +00:00
Melanie 6478617c93 Revert "improve locking of m_items in SceneObjectPartInventory"
This reverts commit 968b9e160d.
2010-02-02 03:49:00 +00:00
Diva Canto 4eeddf3078 Bug fix for finding default regions if the specified one doesn't exist. 2010-02-01 16:52:42 -08:00
Diva Canto bb736cee6b Beginning of friends. 2010-02-01 16:05:59 -08:00
Justin Clark-Casey (justincc) 08721be374 minor: rename GetScriptPrimType() to GetPrimType() 2010-02-01 22:33:15 +00:00
Justin Clark-Casey (justincc) 5432925a3b move hollow sphere faces bug back up to LSL_Api.cs 2010-02-01 22:29:21 +00:00
Justin Clark-Casey (justincc) ecc068fbe0 remove now duplicated shape code from LSL_Api.cs 2010-02-01 22:08:00 +00:00
Justin Clark-Casey (justincc) 3863cd1d23 Copy prim face color setting code from LSL_Api down into SOP so that non-LSL callers can use it 2010-02-01 21:35:05 +00:00
Justin Clark-Casey (justincc) 4c1740f7d8 Actually make EventManager.OnAttach() fire when an object is attached. Previously, only detach was firing! 2010-02-01 20:15:36 +00:00
Justin Clark-Casey (justincc) 53a01dc422 Don't try to start attachment scripts or send updates if the attachment itself has been unsuccessful 2010-02-01 20:06:43 +00:00
Diva Canto 8466f13976 Bug fix for getting region flags. 2010-02-01 07:53:55 -08:00
Diva Canto 7896965d71 Batter debug messages. 2010-01-31 22:40:06 -08:00
Diva Canto 35a245b67a Assorted bug fixes related to hyperlinking 2010-01-31 22:35:23 -08:00
Diva Canto 35de8e91ec * Remove unnecessary debug message
* Bug fix in UserAgentService, logout
2010-01-31 17:27:56 -08:00
Diva Canto 0b89afd3e5 * Simplified the configuration by having [DatabaseService] in it
* Fixed configuration issue for HGInventoryServerInConnector
* Corrected typos in debug messages
2010-01-31 14:37:22 -08:00
Diva Canto a6b50c2436 In HG, add asset service handlers to 8002, to make it even easier. 2010-01-31 14:07:26 -08:00
Diva Canto af758ea164 * More config cleanup
* Added different ports (8002 and 8003) to the many services in OpenSim.Server.ini.example
* Added a separate OpenSim.Server.HG.ini.example to make it easier to run
2010-01-31 14:01:47 -08:00
Diva Canto 823b9607e2 Can't comment [Network] even if it's not used. 2010-01-31 13:19:03 -08:00