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
82d0d1c092
Revert "Next OSG test. Don't remove app domains if they contain running threads."
...
This reverts commit f831a1778b
2010-06-02 21:02:53 +01:00
f831a1778b
Next OSG test. Don't remove app domains if they contain running threads.
2010-06-02 19:57:03 +01:00
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
c38f7c96e7
Revert "Next OSG TEST RELEASE. Join aborted threads."
...
This reverts commit 698066d7e3
2010-06-02 18:00:44 +01:00
698066d7e3
Next OSG TEST RELEASE. Join aborted threads.
2010-06-02 17:41:28 +01:00
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
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
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
992efdc283
Fix a nullref in EventManager caused by RegionReady not setting the scene
2010-05-30 23:57:33 +01:00
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
5074d290e4
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-05-27 21:35:17 +01:00
d6e1333810
If a transfer request is received for a task inventory item asset, then route the permissions request through the existing CanEditScript() and CanEditNotecard() methods.
...
This implements the 'share with group' flag for notecards and scripts in prim inventory since the PermissionsModule checks group membership and permissions.
Other than that, the code in PermissionsModule duplicates the checks in LLClientView so there should be no change other than allowing group members to edit embedded notecards and scripts.
For all other asset types, the permission checking code in LLClientView continues to be used, pending refactoring of suitable permissions code
This means that 'share with group' will not yet work for prim inventory items other than notecards and scripts
2010-05-26 21:12:56 +01:00
66a833796c
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-05-26 20:59:25 +01:00
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
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
8048a8a39d
backport some IGroupsModule method doc and an extra exposed method from git master
2010-05-24 17:33:58 +01:00
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
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
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
e4114799c3
Replace CSJ2K with fixed version (Mantis #3318 )
2010-05-21 15:57:36 +01:00
59546a348a
Change the way the object perms are propagated to attempt to salvage
...
some older content
2010-05-21 15:57:16 +01:00
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
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
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
d446b19e72
minor: commented out code removal
2010-05-20 23:34:44 +01:00
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
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
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
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
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
1ed7b591b2
automatically delete %temp% directory after running tests
...
this prevents a huge cruft buildup
2010-05-20 22:49:52 +01:00
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
009b15c436
Make "nant distbin" remove BUILDING.txt
2010-05-15 02:08:07 +01:00
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
25bb80da77
remove unrequired [Groups] section from GridCommon.ini.example, as per Nebadon
2010-05-15 00:33:05 +01:00
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
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
12ee3a3c93
change 0.6.9 flavour to post-fixes
2010-05-14 21:40:37 +01:00
e79eac238e
switch 0.6.9 flavour to release
2010-05-14 21:30:53 +01:00
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
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
547e027899
Fix linking issue introduced in my earlier commit
2010-05-14 20:57:43 +01:00
91cfce3758
back port groups changes
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-05-05 16:11:00 +01:00
8a69070b51
back port groups changes
2010-05-05 16:09:53 +01:00
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
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
087f475893
Merge branch '0.6.9-post-fixes' into 0.6.9
2010-05-03 21:36:04 +01:00
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
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)