aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '0.6.9-post-fixes' into share-with-groupJustin Clark-Casey (justincc)2010-06-0814-59/+224
|\
| * minor: remove some commented out code and return ↵Justin Clark-Casey (justincc)2010-06-072-7/+1
| | | | | | | | ScenePresence.UpdatePriority() to private
| * Stop some hud components disappearing on region crossingsJustin Clark-Casey (justincc)2010-06-073-13/+76
| | | | | | | | | | | | | | | | 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.
| * reapply fix for double sending of attachment update on standalone region ↵Justin Clark-Casey (justincc)2010-06-079-48/+48
| | | | | | | | crossing
| * commit code which stops full updates being fired multiple times when ↵Justin Clark-Casey (justincc)2010-06-079-22/+122
| | | | | | | | | | | | attachments cross standalone region boundaries lots of messy debug code here too which would need to be removed
| * Revert "commit code which stops full updates being fired multiple times when ↵Justin Clark-Casey (justincc)2010-06-049-122/+22
| | | | | | | | | | | | | | | | attachments cross standalone region boundaries" This reverts commit 5074d290e4aeb583560272cadc8ba09aa8337210. This gets rid of the massive amount of scene object log spam - sorry about that, folks
| * Merge remote branch 'origin/0.6.9' into 0.6.9-post-fixesJustin Clark-Casey (justincc)2010-06-041-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * Apply patch from http://opensimulator.org/mantis/bug_view_page.php?bug_id=4671Justin Clark-Casey2010-05-141-0/+4
| | | | | | | | | | | | | | | Fixes a bug where the viewer didn't recieve the uuid of a chat broadcasting object Thanks crystalsgalicia!
| | * Fix linking issue introduced in my earlier commitMelanie Thielker2010-05-141-1/+19
| | |
| | * Merge branch '0.6.9-post-fixes' into 0.6.9Justin Clark-Casey (justincc)2010-05-036-40/+67
| | |\
| | * | Address symptom of Mantis 4588 (though not the cause) by moving the avatar ↵Justin Clark-Casey (justincc)2010-05-031-2/+3
| | | | | | | | | | | | | | | | dereference inside the exception catch
| * | | Revert "Next OSG test. Don't remove app domains if they contain running ↵Melanie2010-06-021-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | threads." This reverts commit f831a1778baa766b4810e352f3ae2ab6736e4620. With this, post-fixes is back to normal.
| * | | Next OSG test. Don't remove app domains if they contain running threads.Melanie2010-06-021-4/+6
| | | |
| * | | Next OSG test. Cowardly refuse to save the state of badly behaved scripts, ↵Melanie2010-06-021-2/+5
| | | | | | | | | | | | | | | | instead of forcing the issue.
| * | | Revert "After aborting a thread, wait for it to actually finish. ↵Melanie2010-06-021-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | EXPERIMENTAL for OSG" This reverts commit 241ed5734ee3c5b1417484dfa22af6cf6ae60b82.
| * | | After aborting a thread, wait for it to actually finish. EXPERIMENTAL for OSGMelanie2010-06-021-0/+1
| | | | | | | | | | | | | | | | testing. DO NOT UPDATE TO THIS UNLESS YOU KNOW WHAT YOU'RE DOING!
| * | | Comment and remove JScript support. Mono 2.7Dev and 2.8 no longer include theMelanie2010-06-011-19/+19
| | | | | | | | | | | | | | | | needed libraries
| * | | Fix a nullref in EventManager caused by RegionReady not setting the sceneMelanie Thielker2010-05-301-0/+1
| | | |
| * | | Adjust Scene.DeleteAllSceneObjects() to not delete objects attached to avatars.Justin Clark-Casey (justincc)2010-05-281-2/+6
| | | | | | | | | | | | | | | | | | | | 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
| * | | commit code which stops full updates being fired multiple times when ↵Justin Clark-Casey (justincc)2010-05-279-22/+122
| | | | | | | | | | | | | | | | | | | | | | | | attachments cross standalone region boundaries lots of messy debug code here too which would need to be removed
* | | | If a transfer request is received for a task inventory item asset, then ↵Justin Clark-Casey (justincc)2010-05-262-25/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | check group membership and powers with the groups module rather than just ↵Justin Clark-Casey (justincc)2010-05-261-12/+27
| | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Partially implement share with group option for object inventory itemsJustin Clark-Casey (justincc)2010-05-264-7/+21
|/ / / | | | | | | | | | | | | | | | | | | | | | 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
* | | backport from master fix for attachment displayJustin Clark-Casey (justincc)2010-05-243-3/+5
| | | | | | | | | | | | this fix stops two full updates being sent on attachment rather than one. Sending two can stop the client displaying attachments properly
* | | backport some IGroupsModule method doc and an extra exposed method from git ↵Justin Clark-Casey (justincc)2010-05-241-2/+31
| | | | | | | | | | | | master
* | | stop "load oar" reporting ignored objects when those objects were actually ↵Justin Clark-Casey (justincc)2010-05-241-1/+1
| | | | | | | | | | | | | | | | | | | | | 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.
* | | Only send dialogs and notices to root agents, not child agentsJustin Clark-Casey (justincc)2010-05-211-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | Small change for backport Conflicts: OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
* | | Change the way the object perms are propagated to attempt to salvageMelanie2010-05-211-21/+23
| | | | | | | | | | | | some older content
* | | minor: correctly print out missing item id when it can't be found rather ↵Justin Clark-Casey (justincc)2010-05-202-2/+4
| | | | | | | | | | | | than a NullReferenceException
* | | Don't append ACKs to zerocoded packets. Although this should fine in theory, ↵John Hurliman2010-05-201-15/+20
| | | | | | | | | | | | 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
* | | minor: commented out code removalJustin Clark-Casey (justincc)2010-05-201-1/+0
| | |
* | | Completely prevent full update packets being sent after kill object packetsJustin Clark-Casey (justincc)2010-05-201-3/+0
| | | | | | | | | | | | | | | | | | 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
* | | Completely prevent full update packets being sent after kill object packetsJustin Clark-Casey (justincc)2010-05-201-5/+46
| | | | | | | | | | | | | | | 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
* | | minor: Print out port that http servers are usingJustin Clark-Casey (justincc)2010-05-202-9/+9
| | | | | | | | | | | | do this in callers so that we know who is setting up these things
* | | move linden notecard parsing from LSL_Api.cs to SLUtil so that region ↵Justin Clark-Casey (justincc)2010-05-204-108/+25
| | | | | | | | | | | | | | | | | | modules can use it backport from master
* | | Address symptom of Mantis 4588 (though not the cause) by moving the avatar ↵Justin Clark-Casey (justincc)2010-05-151-2/+3
| | | | | | | | | | | | dereference inside the exception catch
* | | Merge branch '0.6.9-post-fixes' of ↵Justin Clark-Casey (justincc)2010-05-141-0/+4
|\ \ \ | | | | | | | | | | | | ssh://justincc@opensimulator.org/var/git/opensim into 0.6.9-post-fixes
| * | | Apply patch from http://opensimulator.org/mantis/bug_view_page.php?bug_id=4671Justin Clark-Casey2010-05-141-0/+4
| | | | | | | | | | | | | | | | | | | | Fixes a bug where the viewer didn't recieve the uuid of a chat broadcasting object Thanks crystalsgalicia!
* | | | * Allows both old and new OpenSim.ini params for the XmlRpc Groups Service ↵unknown2010-05-142-31/+80
|/ / / | | | | | | | | | | | | | | | | | | | | | Connector * Fix problem with RequestingAgentID not being sent correctly to server resulting in failed xmlrpc calls * Improved debug output
* | | back port groups changesunknown2010-05-052-1329/+73
| | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com>
* | | back port groups changesunknown2010-05-055-443/+1798
| | |
* | | Revert "Patch from mcortez: Update groups, add ALPHA Siman grid connector ↵Melanie2010-05-054-1570/+320
| | | | | | | | | | | | | | | | | | | | | | | | for groups" The patch was for 0.7 This reverts commit 608bb0dfefbbc97aded6d1357dd9d350053411fb.
* | | Patch from mcortez: Update groups, add ALPHA Siman grid connector for groupsMelanie2010-05-054-320/+1570
| | | | | | | | | | | | | | | | | | Mantis #4646 Signed-off-by: Melanie <melanie@t-data.com>
* | | Fix linking issue introduced in my earlier commitMelanie Thielker2010-04-301-1/+19
| |/ |/|
* | Fix some symbol errorsMelanie2010-04-301-2/+2
| |
* | Fix link security issueMelanie2010-04-306-40/+67
|/
* Changed the GetTextureModule backport to work with the 0.6.9 codebaseJohn Hurliman2010-04-081-2/+11
|
* Backported GetTextureModule and IAssetService.GetCached()John Hurliman2010-04-085-2/+246
|
* Fix bug where approximately half the time, attachments would rez only their ↵Justin Clark-Casey (justincc)2010-03-094-43/+138
| | | | | | | | | | root prim until right clicked (or otherwise updated). The root cause of this problem was that multiple ObjectUpdates were being sent on attachment which differed enough to confuse the client. Sometimes these would eliminate each other and sometimes not, depending on whether the scheduler looked at the queued updates. The solution here is to only schedule the ObjectUpdate once the attachment code has done all it needs to do. Backport from head.
* Small consistency changeMelanie2010-03-071-1/+1
|