| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into careminster | Melanie | 2011-12-09 | 6 | -16/+106 |
| |\ | |||||
| | * | remove some unused fields in ScenePresence | Justin Clark-Casey (justincc) | 2011-12-09 | 1 | -4/+0 |
| | | | |||||
| | * | Fix "fix-phantoms" help message. Thanks Garmin Kawaguichi. | Justin Clark-Casey (justincc) | 2011-12-09 | 1 | -4/+5 |
| | | | |||||
| | * | Move client id check in Scene.Inventory.cs:UpdateInventoryItemAsset so that ↵ | Justin Clark-Casey (justincc) | 2011-12-09 | 1 | -4/+6 |
| | | | | | | | | | | | | | it doesn't trigger an exception if the item hasn't been found. In this situation we will now put out a slightly more meaningful log error message instead. | ||||
| | * | Add commented log lines to FetchInventoryDescendents2 path for future use. | Justin Clark-Casey (justincc) | 2011-12-09 | 3 | -4/+95 |
| | | | | | | | | | Haven't been able to resolve issue where attachments are removed by the viewer on relog on a localhost | ||||
| * | | Restore the Avination way of position and angle calculation so resizers | Melanie | 2011-12-09 | 1 | -5/+2 |
| | | | | | | | | | work again. | ||||
| * | | Set adaptive throttles false by default because it doesn't play nice with AVN | Melanie | 2011-12-09 | 1 | -1/+1 |
| | | | | | | | | | code | ||||
| * | | Fix llGetLinkKey to report avatars properly | Melanie | 2011-12-09 | 1 | -19/+0 |
| | | | |||||
| * | | Reverse the last one | Melanie | 2011-12-09 | 1 | -1/+1 |
| | | | |||||
| * | | Dummy commit | Melanie | 2011-12-09 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'careminster' into bigmerge | Melanie | 2011-12-09 | 0 | -0/+0 |
| |\ \ | |||||
| | * | | Fix the XMREngine not starting scripts on region startup. Turns out it | Melanie Thielker | 2010-07-25 | 1 | -5/+0 |
| | | | | | | | | | | | | | was a dumb merge artefact that caused it. | ||||
| | * | | Fix the XmlRpcRouterModule so it reads from the correct config section ↵ | Tom Grimshaw | 2010-07-24 | 1 | -2/+2 |
| | | | | | | | | | | | | | ([XMLRPC] not [Startup]) and disable by default (since it's disabled in the ini by default) | ||||
| | * | | Add an m_enabled flag to XmlRpcRouterModule so it won't try to bind the ↵ | Tom Grimshaw | 2010-07-24 | 1 | -2/+10 |
| | | | | | | | | | | | | | xmlrpc_uri event if it's not mentioned in the ini. | ||||
| | * | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Tom Grimshaw | 2010-07-22 | 0 | -0/+0 |
| | |\ \ | |||||
| | | * | | Fix up the name of the default permissions module to match it's config name | Melanie Thielker | 2010-07-23 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | ... Then, make sure we also check the old-style module stack before we throw ↵ | Tom Grimshaw | 2010-07-22 | 1 | -2/+13 |
| | | | | | | | | | | | | | | | | | a tantrum | ||||
| | * | | | First, change DefaultPermissionsModule so it returns the correct name... | Tom Grimshaw | 2010-07-22 | 1 | -1/+1 |
| | |/ / | |||||
| | * | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Tom Grimshaw | 2010-07-22 | 4 | -27/+59 |
| | |\ \ | |||||
| | | * | | Allow megaregions to be used in M7, should we so decide | Melanie Thielker | 2010-07-21 | 2 | -22/+27 |
| | | | | | |||||
| | | * | | Merge branch '0.6.9-post-fixes' into careminster | Melanie | 2010-07-21 | 3 | -5/+32 |
| | | |\ \ | |||||
| | | | * | | Fix the XML serializationt to provide an empty script state element if | Melanie | 2010-07-20 | 1 | -4/+28 |
| | | | | | | | | | | | | | | | | | | | | | the script hasn't yet saved state, or can't save state because of a loop | ||||
| | | | * | | Allow Megaregions to start properly after an unclean shutdown | Melanie | 2010-07-17 | 2 | -1/+4 |
| | | | | | | |||||
| | * | | | | Add config option securePermissionsLoading which will stop the region from ↵ | Tom Grimshaw | 2010-07-22 | 2 | -0/+24 |
| | |/ / / | | | | | | | | | | | | | loading if the specified permissions modules fail to load. | ||||
| | * | | | Merge branch '0.6.9-post-fixes' into careminster | Melanie | 2010-07-17 | 24 | -223/+667 |
| | |\ \ \ | | |/ / | |||||
| | | * | | Stop occasional permanently high 100% utilization when the server is started ↵ | Justin Clark-Casey (justincc) | 2010-07-17 | 1 | -10/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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! | ||||
| | | * | | extend exception catching for DoCreateChildAgentCall() from just ↵ | Justin Clark-Casey (justincc) | 2010-07-17 | 1 | -4/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | WebException to Exception on feedback from Chris Hart. See http://opensimulator.org/mantis/view.php?id=4810 | ||||
| | | * | | Bug in 0.6.9 sometimes restoring script state causes region console to crash ↵ | unknown | 2010-07-17 | 1 | -39/+84 |
| | | | | | | | | | | | | | | | | | 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. | ||||
| | | * | | Merge branch '0.6.9-post-fixes' of ssh://opensimulator.org/var/git/opensim ↵ | Justin Clark-Casey (justincc) | 2010-07-13 | 3 | -13/+18 |
| | | |\ \ | | | | | | | | | | | | | | | | into 0.6.9-post-fixes | ||||
| | | | * | | llVecNorm() now returns a zero-length vector when one is supplied as input. ↵ | dahlia | 2010-07-08 | 1 | -7/+2 |
| | | | | | | | | | | | | | | | | | | | | | Addresses Mantis #4752 | ||||
| | | | * | | fix a potential division by zero | dahlia | 2010-07-08 | 1 | -6/+11 |
| | | | | | | |||||
| | | | * | | Fix scripts in rezzed objects not starting (Mantis #4775) | Melanie | 2010-06-30 | 1 | -0/+5 |
| | | | | | | |||||
| | | * | | | replace o with ; in oXmlRpcPort in OpenSim.ini.example | Justin Clark-Casey (justincc) | 2010-07-13 | 1 | -1/+1 |
| | | |/ / | | | | | | | | | | | | | Thanks to Nebadon for the spot | ||||
| | | * | | If an emergency pos is required for a new root agent, correctly preserve the ↵ | Justin Clark-Casey (justincc) | 2010-06-30 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | | * | | Revert "stop exceptions in setting and getting state from propogating since ↵ | Justin Clark-Casey (justincc) | 2010-06-29 | 1 | -31/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | they aren't fatal to operations" This reverts commit ae2454821628d847b0add20a4c593162baafde5b. Reverted for now pending a fix to the underlying xengine problem instead. | ||||
| | | * | | stop exceptions in setting and getting state from propogating since they ↵ | Justin Clark-Casey (justincc) | 2010-06-29 | 1 | -8/+31 |
| | | | | | | | | | | | | | | | | | | | | | | | | | aren't fatal to operations this will hopefully stop "save oar" from failing if a script asset is corrupt | ||||
| | | * | | revert group membership checking to older code pending resolution of ↵ | Justin Clark-Casey (justincc) | 2010-06-11 | 1 | -0/+11 |
| | | | | | | | | | | | | | | | | | reported performance problems | ||||
| | | * | | remove SimianGrid Groups OpenSim.ini.example stuff that accidentally crept ↵ | Justin Clark-Casey (justincc) | 2010-06-11 | 1 | -10/+3 |
| | | | | | | | | | | | | | | | | | in through a cherry-pick | ||||
| | | * | | If a script is deleted before it gets compiled, don't even bother to try | Melanie | 2010-06-09 | 1 | -0/+19 |
| | | | | | | | | | | | | | | | | | compiling it | ||||
| | | * | | Improve instructions for [Groups] setup in OpenSim.ini.example | Justin Clark-Casey (justincc) | 2010-06-08 | 1 | -12/+15 |
| | | | | | |||||
| | | * | | backport xmlrpcgroups cache from master | Justin Clark-Casey (justincc) | 2010-06-08 | 5 | -59/+112 |
| | | | | | |||||
| | | * | | remove references to OpenSim.Framework.Commuications.Tests.dll since all ↵ | Justin Clark-Casey (justincc) | 2010-06-08 | 3 | -26/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | relevant test code has been obsoleted this allows the tests to pass on my local system | ||||
| | | * | | Merge branch '0.6.9-post-fixes' into share-with-group | Justin Clark-Casey (justincc) | 2010-06-08 | 79 | -254/+6352 |
| | | |\ \ | |||||
| | | | * | | minor: remove some commented out code and return ↵ | Justin Clark-Casey (justincc) | 2010-06-07 | 2 | -7/+1 |
| | | | | | | | | | | | | | | | | | | | | | ScenePresence.UpdatePriority() to private | ||||
| | | | * | | Stop some hud components disappearing on region crossings | Justin Clark-Casey (justincc) | 2010-06-07 | 4 | -14/+79 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-07 | 9 | -48/+48 |
| | | | | | | | | | | | | | | | | | | | | | crossing | ||||
| | | | * | | commit code which stops full updates being fired multiple times when ↵ | Justin Clark-Casey (justincc) | 2010-06-07 | 10 | -23/+123 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-26 | 2 | -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-26 | 1 | -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 items | Justin Clark-Casey (justincc) | 2010-05-26 | 4 | -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 | ||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |