Commit Graph

12687 Commits (fd37a21b59836143f50fdf994c691d65bd641d52)

Author SHA1 Message Date
Melanie Thielker 5c04d768a6 Bump version number 2010-04-05 22:26:18 +02:00
Kitto Flora 4bf1598930 Merge branch 'master' of ssh://3dhosting.de/var/git/careminster 2010-04-05 16:15:23 -04:00
Thomas Grimshaw 07b4889eab Merge branch 'master' of ssh://TOR/var/git/careminster 2010-04-05 22:11:11 +02:00
Thomas Grimshaw 7a3bb266eb This commit adds some randomness to object persistence. It's a Work In Progress, I am working on improving this to a tiered approach. 2010-04-05 22:11:05 +02:00
Thomas Grimshaw f34cc6b469 Add a much cheaper agent count retrieval method. This is obsoleted by 0.7 so it can be reverted then. 2010-04-05 22:08:34 +02:00
Justin Clark-Casey (justincc) 48d2e8309a check group membership and powers with the groups module rather than just the client's active group id
this resolves the earlier issue where notecards/scripts shared with group could only be edited if the user had that group active
2010-04-05 20:44:19 +01:00
Kitto Flora 9b9e2a8c71 Merge branch 'master' of ssh://3dhosting.de/var/git/careminster 2010-04-05 15:27:13 -04:00
Justin Clark-Casey (justincc) 1be19c7f42 log exceptions that end up at the top of a asynchronous viewer packet method call rather than swallowing them 2010-04-05 19:46:43 +01:00
Melanie 2fbbc13c71 Fix some overlooked merge conflicts that got committed 2010-04-05 19:42:15 +01:00
Justin Clark-Casey (justincc) 9ecad50419 Partially implement share with group option for object inventory items
If serverside permissions are off then this works as expected.  Previously, it was impossible for more than one person to edit such items even if permissions were off.
If serverside permissions are on then this works as expected if the object was created by an avatar who had the required group active.
However, if the group for the object is later set then the contained item is still not editable.  This may be linked to a wider bug where the object is still not modifiable by the group anyway
2010-04-05 19:37:02 +01:00
Kitto Flora 35bf75a77a Merge branch 'master' of ssh://3dhosting.de/var/git/careminster 2010-04-05 14:08:57 -04:00
Melanie ba31b31ed0 Merge branch 'careminster' into careminster-presence-refactor 2010-04-05 18:22:15 +01:00
Melanie fe034dc3e4 Merge branch 'master' into careminster-presence-refactor 2010-04-05 18:12:29 +01:00
Melanie f505c1d0a4 Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster 2010-04-05 18:10:49 +01:00
Melanie 04a68db195 Merge branch '0.6.9-post-fixes' into careminster 2010-04-05 18:10:36 +01:00
kitto e2a521742a ChODE Only: Corrected Heightmap load to iliminate crack at 255M. Added 'fence' option to prevent physical objects crossing region border. 2010-04-04 22:57:32 -04:00
unknown ee198eaa11 Updates to config files for groups
Signed-off-by: Melanie <melanie@t-data.com>
2010-04-04 21:56:57 +01:00
lcc 956225f0e1 Fixed Ban and parcel exclusion. Need to fix the parcel chat too 2010-04-04 18:29:18 +02:00
Melanie dc58c985e8 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-04-04 02:24:52 +01:00
Melanie 936e08e20e Patch from mcortez. This appears to be a huge change to the groups module
and I can't say if this is beneficial or destructive due to the way it
was delivered (zipfile). Pushing this on faith alone.
2010-04-04 02:23:53 +01:00
Diva Canto e6ed9b6747 * Guard against null in last commit 2010-04-03 18:12:03 -07:00
Diva Canto cfa941adc7 Last commit was too fast... must override. 2010-04-03 12:14:57 -07:00
Diva Canto 8f68edfe12 * Fail storing user accounts in the remote connector. 2010-04-03 12:11:54 -07:00
Diva Canto 6485c576a1 * Made UserAccountService handle UserLevel, UserFlags and UserTitle appropriately.
* Removed Store service from the UserAccount handler.
2010-04-03 12:03:34 -07:00
John Hurliman 35c82a31db Don't append ACKs to zerocoded packets. Although this should fine in theory, I'm seeing the viewer ignore or fail to parse ACKs appended to our zerocoded packets. This should cut down on viewer->sim resend traffic 2010-04-02 16:25:14 -07:00
John Hurliman a895de4414 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-04-02 13:32:40 -07:00
John Hurliman 4c9cc56624 * Better logging for Authenticate() failures
* Changed a warning message to debug when fetching user sessions
2010-04-02 13:32:30 -07:00
Melanie a004d88bf3 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-04-02 14:53:52 +01:00
Melanie 4b98d0db92 Adding the groups update (Mantis #4646)
Thanks, mcortez.
2010-04-02 14:53:33 +01:00
Justin Clark-Casey (justincc) e0eba26f7b Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim 2010-04-01 23:59:00 +01:00
Justin Clark-Casey (justincc) 938905df1e oops, add file missing from last commit
refactor out redundant method from GroupsMessagingModule
2010-04-01 22:45:01 +01:00
Justin Clark-Casey (justincc) c33b1de9df expose methods that allow region modules to send messages to groups 2010-04-01 22:37:20 +01:00
Diva Canto 08ba34da03 First attempt at fixing mantis #4641. It's better but there are now some issues with permissions.
(looks like my commit is going to touch CM files, I'm going to let it do it - eof only)
2010-03-31 21:30:44 -07:00
Justin Clark-Casey (justincc) 2bf1761ad8 When saving an oar/iar, don't attempt to write out the data byte array if it's empty
On Mono 2.6 (and probably before) this causes a non-obvious IOException
2010-03-31 19:51:17 +01:00
Melanie 21519d3311 Add missing licenses. Change relicensed LightShare module to proper BSD
licensing.
2010-03-31 13:33:18 +01:00
Melanie 4fefd05839 Merge branch 'master' into careminster-presence-refactor
Remerge the LightShare bits that were pushed to core
2010-03-31 04:38:19 +01:00
Melanie 19ae5e5dbb Adding the LightShare module and scripting API. This code was written by
TomMeta and was contributed by Meta7.
2010-03-31 04:23:51 +01:00
Melanie d315fce2ff Adding the configuration example 2010-03-31 04:22:51 +01:00
Melanie ec637e2b8c Committing the LightShare code, which was developed by TomMeta of Meta7.
This allows scripts to set WindLight parameters for clients connecting
to a region. Currently, this is only supported by the Meta7 viewer.
2010-03-31 04:20:20 +01:00
Melanie 7d917e7c5c Rename Meta7Windlight to LightShare 2010-03-30 23:29:03 +01:00
Melanie 5693870fe2 Merge branch 'master' into careminster-presence-refactor 2010-03-30 21:34:27 +01:00
Justin Clark-Casey (justincc) 8cb81bdc9b minor: commented out code removal 2010-03-30 17:06:30 +01:00
Justin Clark-Casey (justincc) 696d711d15 Completely prevent full update packets being sent after kill object packets
If a full update is sent after the kill, the object remains as in the linden viewer but in an undeletable and unowned state until relog
This patch prevents this by recording kills in LLClientView
2010-03-30 17:04:26 +01:00
Justin Clark-Casey (justincc) 24fc4703d0 fix build break. First argument of GetGroupRecord is not a uuid 2010-03-29 22:02:02 +01:00
Melanie e7e56e0143 Remove a redundant method body 2010-03-29 19:50:24 +01:00
Melanie 607ed61ec2 Stab one bug. When joining an estate with a new region, make sure it's also
used on first run and not only later.
2010-03-28 23:18:25 +01:00
Diva Canto efc0916a01 May fix mantis #4613 2010-03-27 22:48:15 -07:00
John Hurliman 1430441cf3 Change the SimianGrid connector log messages to start with "[SIMIAN " to avoid configuration confusion 2010-03-26 15:13:55 -07:00
John Hurliman 493d02d2e6 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-03-26 13:50:45 -07:00
John Hurliman d6a64bf732 * Catch exceptions thrown when MySQLEstateData.LinkRegion() is called. This won't fix the bug I'm seeing with regions not realizing they are already part of an estate, but it will fix the OpenSim crash if that situation ever comes up 2010-03-26 13:50:25 -07:00