Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Refactor: Replace instances of m_isphysical with IsPhysical rather than have ↵ | Justin Clark-Casey (justincc) | 2011-07-30 | 1 | -33/+40 |
| | | | | | | some code reference the private var and other the public var without any functionality difference. Add some method doc to IsPhysical | ||||
* | refactor: Rename ODEPrim.ParentPrim() to AddChildPrim() for code readability | Justin Clark-Casey (justincc) | 2011-07-30 | 1 | -11/+14 |
| | |||||
* | minor: remove mono compiler warnings, some code spacing adjustments | Justin Clark-Casey (justincc) | 2011-07-30 | 3 | -7/+8 |
| | |||||
* | minor: remove some mono compiler warnings | Justin Clark-Casey (justincc) | 2011-07-30 | 1 | -3/+4 |
| | |||||
* | minor: Add method doc to collision subscription methods. Change method case ↵ | Justin Clark-Casey (justincc) | 2011-07-30 | 4 | -8/+26 |
| | | | | to reflect OpenSim standards. | ||||
* | refactor: extract method that generates a physics mesh from prim shape data | Justin Clark-Casey (justincc) | 2011-07-30 | 1 | -117/+141 |
| | |||||
* | refactor: extract code which generate points and faces from sculpt data into ↵ | Justin Clark-Casey (justincc) | 2011-07-30 | 1 | -220/+240 |
| | | | | | | it's own method. fix build break. | ||||
* | fix bug in previous commit | Justin Clark-Casey (justincc) | 2011-07-30 | 1 | -1/+2 |
| | |||||
* | refactor: move the code that generates physics meshs from prim mesh data ↵ | Justin Clark-Casey (justincc) | 2011-07-30 | 1 | -99/+123 |
| | | | | into a separate method, in order to make the code more readable. | ||||
* | Replace the generic exception logging in flotsam asset cache with more ↵ | Justin Clark-Casey (justincc) | 2011-07-30 | 1 | -26/+24 |
| | | | | specific stuff to return more information. | ||||
* | correct misleading "fcache status" text - deep scans are not performed when ↵ | Justin Clark-Casey (justincc) | 2011-07-30 | 1 | -1/+1 |
| | | | | this command is invoked. | ||||
* | Make it clearer what the save_crashes setting in [Startup] actually does. | Justin Clark-Casey (justincc) | 2011-07-30 | 2 | -0/+6 |
| | |||||
* | Temporary code to change bad AvatarHeight values in the AvatarService to the ↵ | Justin Clark-Casey (justincc) | 2011-07-30 | 1 | -1/+27 |
| | | | | | | | default Ruth height. I was persuaded to do this because simulators on osgrid will persist in inserting bad values for an unknown length of time, even after the original simulator bug which was inserting bad values is out in an osgrid distro This code can be removed at some point in the future, though I think there is an argument for having services police these values in open grids. | ||||
* | Temporarily put in a log line which shows which locale the user is running in. | Justin Clark-Casey (justincc) | 2011-07-29 | 2 | -0/+6 |
| | |||||
* | For all Util.FireAndForget invocations, set thread to en_US before ↵ | Justin Clark-Casey (justincc) | 2011-07-29 | 1 | -5/+10 |
| | | | | | | | | | | continuing wtih the invocation. This is to avoid bugs where the locale is not manually set on the thread and bad data values get sent to the database or over the wire. Lots of code does this manually but as we've seen, a subtle change can hit code which has forgotton to do this. Since en_US show be used throughout the server at present, setting it at FireAndForget seems reasonable. Arguably, it would be better to do this where data is sent, but doing it here is much easier. All the manual BeginInvokes() remaining in the code should probably call FireAndForget instead. | ||||
* | When we start the appearance saving thread, make sure we set the culture to ↵ | Justin Clark-Casey (justincc) | 2011-07-29 | 1 | -0/+5 |
| | | | | | | | En_US so that a different culture doesn't save values with commas as decimal points, etc. This will hopefully stop giants stalking the grid. See http://opensimulator.org/mantis/view.php?id=5614 | ||||
* | Return null from CreateMeshFromPrimMesher if OpenJPEG decoding of the sculpt ↵ | Justin Clark-Casey (justincc) | 2011-07-29 | 1 | -1/+11 |
| | | | | | | data fails. This is to address http://opensimulator.org/mantis/view.php?id=5612 | ||||
* | fix extremely minor Ode bug where the _taintedPrimL list would always be ↵ | Justin Clark-Casey (justincc) | 2011-07-29 | 1 | -3/+14 |
| | | | | cleared on every OdeScene.Simulate() even if it was already empty. | ||||
* | refactor: Move another chunk of ninja code out of the OdeScene.Simulate() ↵ | Justin Clark-Casey (justincc) | 2011-07-29 | 1 | -28/+36 |
| | | | | loop for consistency and readability. | ||||
* | refactor: Simplify reading OdeScene.Simulate() loop by shunting all the ↵ | Justin Clark-Casey (justincc) | 2011-07-29 | 1 | -182/+191 |
| | | | | | | NINJA joints stuff into its own method. Now if ninja joints isn't active (which is the default) don't have to wade through a lot of massively indented irrelevant code. | ||||
* | refactor: unindent the OdeScene.Simulate() loop to ignore the long commented ↵ | Justin Clark-Casey (justincc) | 2011-07-29 | 1 | -270/+274 |
| | | | | | | out ifs and locks This is to make it more readable. | ||||
* | When using osTeleportAgent() and osTeleportAvatar(), only teleport if the ↵ | Justin Clark-Casey (justincc) | 2011-07-29 | 1 | -4/+8 |
| | | | | | | | | region name exactly matches (not near matches) This is to prevent situations where the first name returned by GridService.GetRegionsByName is not one that exactly matches the given region name, even when there is an exact match later on in the list. Only the above two functions call this teleport method (the map uses a different routine) so this seems safe to change. Addresses http://opensimulator.org/mantis/view.php?id=5606 | ||||
* | Ensure that packet headers get parsed correctly | Melanie | 2011-07-27 | 1 | -0/+29 |
| | |||||
* | Fix LLTextBox to work with the updated libOMV | Melanie | 2011-07-23 | 7 | -7/+14 |
| | |||||
* | Pass the first name and last name from the agent circuit data to the ↵ | Justin Clark-Casey (justincc) | 2011-07-23 | 7 | -37/+50 |
| | | | | | | | | | | authorization service rather than from the account. This is to accomodate situations where the authorization service is being used by the hypergrid, where visitors have no user account. See http://opensimulator.org/mantis/view.php?id=5517, this code is somewhat adapted/cleaned up from Michelle's patch I'm a little ambivalent about this since visitors could put anything in firstname/lastname so it's not much of an auth measure. It's up to the auth service to decide which data it actually uses. Possibly we should be passing through other info such as agent circuit ip | ||||
* | Change default AllowScriptCrossings config setting to true. | Justin Clark-Casey (justincc) | 2011-07-23 | 2 | -5/+9 |
| | | | | | | When this setting is false and other defaults haven't been changed, scripts entering the simulator from another sim are automatically restarted but their state is not preserved. When this setting is true, state that accompanies the script is reloaded (e.g. if a script had a variable i = 1 when leaving the source region, it will still have i = 1 on the destination region). This setting does not affect crossings when regions are run in the same simulator. In this case, state is already preserved. | ||||
* | Fixed serverside_object_permission default value confliction | Makopoppo | 2011-07-23 | 2 | -3/+3 |
| | |||||
* | For default everyone permissions on library items, make notecards and ↵ | Justin Clark-Casey (justincc) | 2011-07-23 | 2 | -9/+6 |
| | | | | | | | | | | scripts non-modifiable (but still copyable, etc). Users should not be given the impression that they can modify these items. This still does not solve the issue where library items cannot be dragged into prims or user inventory any time after they are initially seen. Curiously, manually copying and pasting still appears to work. On the surface, this seems to have something to do with library item caching on the client, since deleting the cache allows drag to work again once Not sure what the exact problem is. | ||||
* | Remove manually permissions settings on all current library items so that ↵ | Justin Clark-Casey (justincc) | 2011-07-23 | 17 | -545/+152 |
| | | | | | | | they use the defaults instead. Some items had completely wrong permissions - this is easier than correcting them all. The ability to set permissions in xml is retained since there are use cases for this (e.g. to create no-mod library scripts) | ||||
* | Revert "Don't load current/next/everyone/base permissions from the library ↵ | Justin Clark-Casey (justincc) | 2011-07-23 | 17 | -159/+567 |
| | | | | | | | | item xml files - always use PermissionMask.All instead (which was the existing default)." There actually are uses for this. I will correct the perms instead since some entries appear to be wrong. This reverts commit 667b54f5a2a04fa5a2859397868d270eab3913f1. | ||||
* | Don't load current/next/everyone/base permissions from the library item xml ↵ | Justin Clark-Casey (justincc) | 2011-07-23 | 17 | -567/+159 |
| | | | | | | files - always use PermissionMask.All instead (which was the existing default). Library items always need the same permissions, so it doesn't make sense to load them from the xml files. This just opens the door to permissions mistakes. | ||||
* | Fix problem where sculpts were not getting physical proxies | Justin Clark-Casey (justincc) | 2011-07-22 | 1 | -2/+2 |
| | | | | | Fixed this by inspecting Shape.SculptEntry at various places instead of Shape.SculptType. Sculpties actually have a SculptType of Cylinder - only true mesh is SculptType.Mesh This addresses http://opensimulator.org/mantis/view.php?id=5595 | ||||
* | Thank you, Michelle Argus, for a patch that adds reading the agent limit | Melanie | 2011-07-22 | 1 | -1/+4 |
| | | | | from XML properly. | ||||
* | Generate the initial maptile asynchronously | Oren Hurvitz | 2011-07-22 | 2 | -15/+17 |
| | | | | Signed-off-by: Melanie <melanie@t-data.com> | ||||
* | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | root | 2011-07-21 | 5 | -41/+31 |
|\ | |||||
| * | remove the windows debugging symbols for the long protobuf-net | Justin Clark-Casey (justincc) | 2011-07-21 | 1 | -0/+0 |
| | | |||||
| * | remove dead MXP default symbols. The MXP code is long, long gone. | Justin Clark-Casey (justincc) | 2011-07-21 | 1 | -0/+0 |
| | | |||||
| * | make [SMTP] default comment option match actual default | Justin Clark-Casey (justincc) | 2011-07-21 | 2 | -10/+10 |
| | | |||||
| * | minor: group all the map tile options together | Justin Clark-Casey (justincc) | 2011-07-21 | 2 | -15/+16 |
| | | |||||
| * | remove pointless quotes from GenerateMaptiles option in OpenSimDefaults.ini | Justin Clark-Casey (justincc) | 2011-07-21 | 1 | -1/+4 |
| | | |||||
| * | minor: remove the pointless quotes from the GenerateMaptiles option | Justin Clark-Casey (justincc) | 2011-07-21 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2011-07-21 | 3 | -18/+3 |
| |\ | |||||
| | * | Removed unused AddPrimShape methods in PhysicsScene caused by merge conflicts | Dan Lake | 2011-07-20 | 1 | -14/+0 |
| | | | |||||
| * | | make default TextureOnMapTile true for the older map imager | Justin Clark-Casey (justincc) | 2011-07-21 | 2 | -3/+3 |
| | | | | | | | | | | | | Don't know of a good reason not to do this, seems to work fine. | ||||
* | | | When an uncached asset is requested multiple times concurrently, only load ↵ | Oren Hurvitz | 2011-07-21 | 1 | -9/+49 |
| | | | | | | | | | | | | | | | | | | it once Signed-off-by: root <root@grid00001.t-data.com> | ||||
* | | | When handling SetAppearance packet, always save the appearance; not only if ↵ | Oren Hurvitz | 2011-07-21 | 1 | -5/+5 |
| | | | | | | | | | | | | the texture was changed | ||||
* | | | Fixed updating avatar appearance | Oren Hurvitz | 2011-07-21 | 2 | -11/+20 |
| |/ |/| | | | | | Signed-off-by: root <root@grid00001.t-data.com> | ||||
* | | Apply the localID to the Physics actor to prevent null calls later | Careminster Team | 2011-07-19 | 1 | -3/+3 |
| | | |||||
* | | Tidy up a superfluous AddPrimShape override in PhysicsScene | Careminster Team | 2011-07-19 | 1 | -1/+0 |
|/ | |||||
* | On all undo/redo operations, consistently lock the undo object for ↵ | Justin Clark-Casey (justincc) | 2011-07-19 | 1 | -5/+1 |
| | | | | everything, in order to avoid any deadlock issues. |