Commit Graph

11994 Commits (64cc76bd7922e32b0799023faed49904694cf1b4)

Author SHA1 Message Date
Justin Clark-Casey (justincc) 32c43bf59a 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

Resolve conflict in LLClientView
2010-05-26 20:58:40 +01:00
Justin Clark-Casey (justincc) a6c7995b71 backport from master fix for attachment display
this fix stops two full updates being sent on attachment rather than one.  Sending two can stop the client displaying attachments properly
2010-05-24 19:19:44 +01:00
Justin Clark-Casey (justincc) 8048a8a39d backport some IGroupsModule method doc and an extra exposed method from git master 2010-05-24 17:33:58 +01:00
Justin Clark-Casey (justincc) 2603f9a134 stop "load oar" reporting ignored objects when those objects were actually loaded just fine
this fix also means that loaded scripts are properly/more promptly started
here, the fix is only done in the oar module.  In master, the underlying problem was fixed instead but this is more invasive.
2010-05-24 16:53:43 +01:00
Justin Clark-Casey (justincc) 3bd2ec7b2e Apply http://opensimulator.org/mantis/view.php?id=4724
Tweak to update appearance calls
Fix for deleting inventory items from a folder.
Thanks StrawberryFride!
2010-05-21 22:40:15 +01:00
Justin Clark-Casey (justincc) e589a31bc4 Only send dialogs and notices to root agents, not child agents
Small change for backport

Conflicts:

	OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
2010-05-21 22:23:13 +01:00
Melanie e4114799c3 Replace CSJ2K with fixed version (Mantis #3318) 2010-05-21 15:57:36 +01:00
Melanie 59546a348a Change the way the object perms are propagated to attempt to salvage
some older content
2010-05-21 15:57:16 +01:00
Melanie ddd072b3fb Merge branch '0.6.9-post-fixes' into careminster 2010-05-21 02:44:20 +01:00
Melanie 147c2d6f80 Change the way the object perms are propagated to attempt to salvage
some older content
2010-05-21 02:31:14 +01:00
Justin Clark-Casey (justincc) 427ae1087f minor: correctly print out missing item id when it can't be found rather than a NullReferenceException 2010-05-20 23:44:49 +01:00
John Hurliman 1c63f6cd85 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-05-20 23:38:38 +01:00
Justin Clark-Casey (justincc) 3b38cc10de 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-05-20 23:35:36 +01:00
Justin Clark-Casey (justincc) d446b19e72 minor: commented out code removal 2010-05-20 23:34:44 +01:00
Justin Clark-Casey (justincc) e9bac02fec 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
Backport from master
2010-05-20 23:32:23 +01:00
Justin Clark-Casey (justincc) 8b5d012200 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-05-20 23:32:11 +01:00
Justin Clark-Casey (justincc) fa8def5e70 minor: Print out port that http servers are using
do this in callers so that we know who is setting up these things
2010-05-20 23:17:56 +01:00
Justin Clark-Casey (justincc) 5fc990d9e7 put out full exception stack if something reaches top of base http server OnRequest() on both mono and .net
replace Newtonsoft.Json.XML since the updated copy got accidentally reverted by another commit
2010-05-20 23:12:02 +01:00
Justin Clark-Casey (justincc) 8d832e3231 Upgrade Newtonsoft.Json.dll from 1.3 to 3.5r6
Actually using the one built against Net 2.0 (labelled Newtonsoft.Json.Net20.dll) since the 3.5 build is not compatible with Mono 2.4 (though it is with Mono 2.6)
2010-05-20 23:02:11 +01:00
Justin Clark-Casey (justincc) 1ed7b591b2 automatically delete %temp% directory after running tests
this prevents a huge cruft buildup
2010-05-20 22:49:52 +01:00
Justin Clark-Casey (justincc) 76238715e3 move linden notecard parsing from LSL_Api.cs to SLUtil so that region modules can use it
backport from master
2010-05-20 22:43:05 +01:00
Tom Grimshaw f77f9ecd8f Fix a nullref issue in SitAltitudeCallback 2010-05-19 13:44:59 -07:00
Tom Grimshaw fc76b5f589 Fix a null reference issue in cmGetAvatarList() 2010-05-19 00:24:54 -07:00
Tom Grimshaw 6bc7e3429f Provide interface to prevent the client close function from sending the stop packet 2010-05-17 14:32:21 -07:00
Justin Clark-Casey 009b15c436 Make "nant distbin" remove BUILDING.txt 2010-05-15 02:08:07 +01:00
Justin Clark-Casey (justincc) dd1b99cd0d Address symptom of Mantis 4588 (though not the cause) by moving the avatar dereference inside the exception catch 2010-05-15 01:07:34 +01:00
Justin Clark-Casey (justincc) 25bb80da77 remove unrequired [Groups] section from GridCommon.ini.example, as per Nebadon 2010-05-15 00:33:05 +01:00
Justin Clark-Casey (justincc) 3a8128d309 Merge branch '0.6.9-post-fixes' of ssh://justincc@opensimulator.org/var/git/opensim into 0.6.9-post-fixes 2010-05-14 23:44:09 +01:00
unknown 2c8d25a110 * Allows both old and new OpenSim.ini params for the XmlRpc Groups Service Connector
* Fix problem with RequestingAgentID not being sent correctly to server resulting in failed xmlrpc calls

* Improved debug output
2010-05-14 23:40:40 +01:00
Justin Clark-Casey (justincc) 12ee3a3c93 change 0.6.9 flavour to post-fixes 2010-05-14 21:40:37 +01:00
Justin Clark-Casey (justincc) e79eac238e switch 0.6.9 flavour to release 2010-05-14 21:30:53 +01:00
Justin Clark-Casey 2f6bb01370 Apply patch from http://opensimulator.org/mantis/bug_view_page.php?bug_id=4671
Fixes a bug where the viewer didn't recieve the uuid of a chat broadcasting object
Thanks crystalsgalicia!
2010-05-14 21:24:28 +01:00
Justin Clark-Casey 9209657f93 Apply patch from http://opensimulator.org/mantis/bug_view_page.php?bug_id=4671
Fixes a bug where the viewer didn't recieve the uuid of a chat broadcasting object
Thanks crystalsgalicia!
2010-05-14 21:22:53 +01:00
Melanie Thielker 547e027899 Fix linking issue introduced in my earlier commit 2010-05-14 20:57:43 +01:00
Kitto Flora bc7d84b75c Merge branch 'master' of ssh://3dhosting.de/var/git/careminster 2010-05-07 15:16:59 -04:00
Kitto Flora add7abc1de Fix Mouse+WASD makes Av rise; Fix PREJUMP. 2010-05-07 14:12:07 -04:00
unknown 91cfce3758 back port groups changes
Signed-off-by: Melanie <melanie@t-data.com>
2010-05-05 16:11:00 +01:00
unknown 8a69070b51 back port groups changes 2010-05-05 16:09:53 +01:00
Melanie 6fdd5bfe2d Revert "Patch from mcortez: Update groups, add ALPHA Siman grid connector for groups"
The patch was for 0.7

This reverts commit 608bb0dfef.
2010-05-05 16:03:20 +01:00
Melanie 608bb0dfef Patch from mcortez: Update groups, add ALPHA Siman grid connector for groups
Mantis #4646

Signed-off-by: Melanie <melanie@t-data.com>
2010-05-05 14:37:05 +01:00
Justin Clark-Casey (justincc) 087f475893 Merge branch '0.6.9-post-fixes' into 0.6.9 2010-05-03 21:36:04 +01:00
Justin Clark-Casey (justincc) a69cb5e390 Address symptom of Mantis 4588 (though not the cause) by moving the avatar dereference inside the exception catch 2010-05-03 21:34:38 +01:00
sacha 5f6e9e6ab9 Merge branch 'master' of ssh://3dhosting.de/var/git/careminster 2010-05-02 08:18:33 -04:00
sacha 7ad36d3d75 Adding DebugEvent Trap
Adding XMREEvent Trap

 trapDebug("Modulename" ,"My data here ",  scene);
 trapXMRE(int data, string Message, Scene scene);
2010-05-02 08:15:12 -04:00
Justin Clark-Casey (justincc) 8938fac4fd add operation to "nant distbin" to copy StandaloneCommon.ini.example -> StandaloneCommon.ini 2010-04-30 22:36:26 +01:00
Justin Clark-Casey (justincc) 139f425f4c take out some more sqlite db console debug lines 2010-04-30 22:08:57 +01:00
Justin Clark-Casey (justincc) 8966ed9c82 fix an issue with user appearance where the new sqlite db adapter expects directly specification of byte[] type rather than base64 strings 2010-04-30 21:37:31 +01:00
Melanie Thielker 7ae55f6248 Fix linking issue introduced in my earlier commit 2010-04-30 20:18:29 +01:00
Melanie Thielker 0a9c98e7c4 Fix linking issue introduced in my earlier commit 2010-04-30 20:18:08 +01:00
Justin Clark-Casey (justincc) 0b8b302aa0 Fix a bunch of issues that crop up after the naive porting of the new sqlite db from master to 0.6.9 2010-04-30 20:05:57 +01:00