Commit Graph

11997 Commits (3057974f31c7699ebb6efdaa875e384dc9ccb75f)

Author SHA1 Message Date
Tom Grimshaw 3057974f31 Merge branch 'master' of ssh://3dhosting.de/var/git/careminster 2010-07-22 18:06:16 -07:00
Tom Grimshaw bfd883f533 ... Then, make sure we also check the old-style module stack before we throw a tantrum 2010-07-22 18:05:56 -07:00
Tom Grimshaw da5b7e199a First, change DefaultPermissionsModule so it returns the correct name... 2010-07-22 18:04:55 -07:00
Melanie Thielker 64cc76bd79 Fix up the name of the default permissions module to match it's config name 2010-07-23 01:32:29 +02:00
Tom Grimshaw bf374705c6 Merge branch 'master' of ssh://3dhosting.de/var/git/careminster 2010-07-22 10:49:14 -07:00
Tom Grimshaw 9ce2f95f37 Add config option securePermissionsLoading which will stop the region from loading if the specified permissions modules fail to load. 2010-07-22 10:46:57 -07:00
Melanie Thielker 316854dc13 Allow megaregions to be used in M7, should we so decide 2010-07-21 19:25:40 +01:00
Melanie 9136e02ed3 Merge branch '0.6.9-post-fixes' into careminster 2010-07-21 19:24:18 +01:00
Melanie 1d6735f0ec Fix the XML serializationt to provide an empty script state element if
the script hasn't yet saved state, or can't save state because of a loop
2010-07-20 21:47:28 +01:00
Melanie 373ac90156 Allow Megaregions to start properly after an unclean shutdown 2010-07-17 07:19:58 +01:00
Melanie 6f591376dd Merge branch '0.6.9-post-fixes' into careminster 2010-07-17 03:09:27 +01:00
Justin Clark-Casey (justincc) 95d9c773d9 Stop occasional permanently high 100% utilization when the server is started with many scripts
See http://opensimulator.org/mantis/view.php?id=4799 for more details
This is the equivalent patch that was applied to master 3.5 weeks ago, seemingly without bad consequences
Thanks Snoopy!
2010-07-17 01:18:43 +01:00
Justin Clark-Casey (justincc) 4ae04dd0a8 extend exception catching for DoCreateChildAgentCall() from just WebException to Exception on feedback from Chris Hart.
See http://opensimulator.org/mantis/view.php?id=4810
2010-07-17 01:00:23 +01:00
unknown 61f9b3c2cf Bug in 0.6.9 sometimes restoring script state causes region console to crash due to unhandled file lock exception. Attempt to resolve by wrapping several instances of file create / read logic in using statements and added some error handling for locked file exceptions. If it is IDisposable, it must be disposed! The close statements are unnecessary but harmless so I have left those in. The end of the using block will close and dispose automagically. 2010-07-17 00:44:54 +01:00
Justin Clark-Casey (justincc) b2ef5658b1 Merge branch '0.6.9-post-fixes' of ssh://opensimulator.org/var/git/opensim into 0.6.9-post-fixes 2010-07-13 23:36:56 +01:00
Justin Clark-Casey (justincc) a7f0af41ab replace o with ; in oXmlRpcPort in OpenSim.ini.example
Thanks to Nebadon for the spot
2010-07-13 23:36:05 +01:00
dahlia c7a2e1b2d4 llVecNorm() now returns a zero-length vector when one is supplied as input. Addresses Mantis #4752 2010-07-08 10:17:28 -07:00
dahlia 0116b80795 fix a potential division by zero 2010-07-08 10:14:02 -07:00
Melanie d743a221e8 Fix scripts in rezzed objects not starting (Mantis #4775) 2010-06-30 21:27:55 +01:00
Justin Clark-Casey (justincc) 92edbd3e47 If an emergency pos is required for a new root agent, correctly preserve the z co-ord instead of accidentally resetting the incorrect x co-ord
This is a one-liner.  It has already been addressed in master and 0.7-post-fixes in a more extensive way
2010-06-30 21:23:57 +01:00
Justin Clark-Casey (justincc) cabb70d90a Revert "stop exceptions in setting and getting state from propogating since they aren't fatal to operations"
This reverts commit ae24548216.

Reverted for now pending a fix to the underlying xengine problem instead.
2010-06-29 22:50:04 +01:00
Justin Clark-Casey (justincc) ae24548216 stop exceptions in setting and getting state from propogating since they aren't fatal to operations
this will hopefully stop "save oar" from failing if a script asset is corrupt
2010-06-29 18:54:31 +01:00
Justin Clark-Casey (justincc) 85c20e1493 revert group membership checking to older code pending resolution of reported performance problems 2010-06-11 19:40:09 +01:00
Justin Clark-Casey (justincc) 821b8a5517 remove SimianGrid Groups OpenSim.ini.example stuff that accidentally crept in through a cherry-pick 2010-06-11 18:43:02 +01:00
Melanie 491d898db8 If a script is deleted before it gets compiled, don't even bother to try
compiling it
2010-06-09 03:52:59 +01:00
Justin Clark-Casey (justincc) 5f60eb136e Improve instructions for [Groups] setup in OpenSim.ini.example 2010-06-08 21:16:19 +01:00
Justin Clark-Casey (justincc) 8b3b89ecf4 backport xmlrpcgroups cache from master 2010-06-08 20:31:39 +01:00
Justin Clark-Casey (justincc) 0524458069 remove references to OpenSim.Framework.Commuications.Tests.dll since all relevant test code has been obsoleted
this allows the tests to pass on my local system
2010-06-08 16:10:40 +01:00
Justin Clark-Casey (justincc) a160b44e07 Merge branch '0.6.9-post-fixes' into share-with-group 2010-06-08 15:50:21 +01:00
Justin Clark-Casey (justincc) 255e05beb5 minor: remove some commented out code and return ScenePresence.UpdatePriority() to private 2010-06-07 19:52:45 +01:00
Justin Clark-Casey (justincc) 912f0c7fde Stop some hud components disappearing on region crossings
If viewers (or at least, Linden Viewer 1.23.5) receive child hud object updates before the root prim, then the children are not displayed.
Updates were being queued in LLClientView in the right order (root first) but were being sent in a random order since they were all at the same prioritization
This commit prioritizes the root prim of a hud to its highest level when queued.
I'm not sure if the periodic reprioritization triggered via ScenePresence might reset this, but boosting priority appears to work so far.
Also committed is a belt and braces mechanism in LLClientView to prevent child hud prim being sent out before their root, but since this doesn't appear to be needed it is currently commented out.
2010-06-07 19:14:40 +01:00
Justin Clark-Casey (justincc) 693b5d0838 reapply fix for double sending of attachment update on standalone region crossing 2010-06-07 19:14:30 +01:00
Justin Clark-Casey (justincc) 50ddb20204 commit code which stops full updates being fired multiple times when attachments cross standalone region boundaries
lots of messy debug code here too which would need to be removed
2010-06-07 19:14:22 +01:00
Melanie cc2622660b Merge branch '0.6.9-post-fixes' into careminster 2010-06-07 05:23:52 +01:00
Justin Clark-Casey (justincc) bdeda18b52 Revert "commit code which stops full updates being fired multiple times when attachments cross standalone region boundaries"
This reverts commit 5074d290e4.

This gets rid of the massive amount of scene object log spam - sorry about that, folks
2010-06-04 18:54:58 +01:00
Justin Clark-Casey (justincc) 8eb70f9719 Fix bug where prim items were not loaded in the new sqlite database handler
This addresses mantis http://opensimulator.org/mantis/view.php?id=4739
2010-06-04 18:02:30 +01:00
Justin Clark-Casey (justincc) 2f6d401db1 Merge remote branch 'origin/0.6.9' into 0.6.9-post-fixes
This chiefly brings in the new sqlite adaptor and renames the old one to SQLiteLegacy
Existing configuratios should continue to work without changes unless you are using Mac OSX and mono 2.6 or later, in which case you will need to enable SQLiteLegacy instead.  Please se the instructions in OpenSim.ini.example and the relevant config/include .ini files

Conflicts:
	OpenSim/Framework/Servers/VersionInfo.cs
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
2010-06-04 18:00:48 +01:00
Melanie 82d0d1c092 Revert "Next OSG test. Don't remove app domains if they contain running threads."
This reverts commit f831a1778b.

With this, post-fixes is back to normal.
2010-06-02 21:02:53 +01:00
Melanie f831a1778b Next OSG test. Don't remove app domains if they contain running threads. 2010-06-02 19:57:03 +01:00
Melanie 20e6b7a320 Next OSG test. Cowardly refuse to save the state of badly behaved scripts, instead of forcing the issue. 2010-06-02 18:05:58 +01:00
Melanie c38f7c96e7 Revert "Next OSG TEST RELEASE. Join aborted threads."
This reverts commit 698066d7e3.
2010-06-02 18:00:44 +01:00
Melanie 698066d7e3 Next OSG TEST RELEASE. Join aborted threads. 2010-06-02 17:41:28 +01:00
Melanie c5cfae7bac Revert "After aborting a thread, wait for it to actually finish. EXPERIMENTAL for OSG"
This reverts commit 241ed5734e.
2010-06-02 17:39:58 +01:00
Melanie 241ed5734e After aborting a thread, wait for it to actually finish. EXPERIMENTAL for OSG
testing. DO NOT UPDATE TO THIS UNLESS YOU KNOW WHAT YOU'RE DOING!
2010-06-02 17:14:37 +01:00
Tom Grimshaw 0209033dd9 Gosh, fixing another nullref issue in cmGetAvatarList. I deserve spanks. 2010-06-01 13:22:24 -07:00
Melanie f5ca701273 Comment and remove JScript support. Mono 2.7Dev and 2.8 no longer include the
needed libraries
2010-06-01 14:19:26 +01:00
Melanie 0526a91206 Merge branch '0.6.9-post-fixes' into careminster 2010-05-31 17:57:48 +01:00
Tom Grimshaw 4be13b1a42 Fix casting in llParcelMediaCommandList so that it actually, you know, works 2010-05-31 08:41:00 -07:00
Melanie Thielker 992efdc283 Fix a nullref in EventManager caused by RegionReady not setting the scene 2010-05-30 23:57:33 +01:00
Justin Clark-Casey (justincc) c7d812802f Adjust Scene.DeleteAllSceneObjects() to not delete objects attached to avatars.
This is going to be the right behaviour in all cases, I should think.
This means that avatars in region when an oar is loaded do not lose their attachments
2010-05-28 18:52:30 +01:00