Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | remove the unused ODEPrim.prev_geom field | Justin Clark-Casey (justincc) | 2011-08-01 | 1 | -3/+0 |
| | |||||
* | When an ODE geom is removed (as when a non-phantom prim is deleted, resized ↵ | Justin Clark-Casey (justincc) | 2011-08-01 | 1 | -0/+2 |
| | | | | | | or shape changed, also remove the OdeScene.actor_name_map entry pointing to the phys actor This is to stop a small memory leak over time when prims are deleted or phantom-toggled | ||||
* | refactor: centralize prim geom removal code from four places to one | Justin Clark-Casey (justincc) | 2011-08-01 | 3 | -43/+48 |
| | |||||
* | minor: add note to RemovePrimThreadLocked() to the effect that it contrary ↵ | Justin Clark-Casey (justincc) | 2011-08-01 | 2 | -1/+4 |
| | | | | to the summary, it is being called from within Simulate() lock (OdeLock) | ||||
* | If a prim changes size or shape, add actor to _parent_scene.actor_name_map ↵ | Justin Clark-Casey (justincc) | 2011-08-01 | 1 | -1/+4 |
| | | | | | | | | with new prim_geom key, as the old one becomes invalid. This resolves http://opensimulator.org/mantis/view.php?id=5603 where changing size or shape would stop collision_start being fired in a running script. In both this and existing code we are not removing old actors from actor_name_map when the existing prim_geom is removed, which leads to a small memory leak over time. This needs to be fixed. | ||||
* | minor: indentation correction | Justin Clark-Casey (justincc) | 2011-08-01 | 1 | -17/+13 |
| | |||||
* | Comment out SOP logging message I accidentally left in | Justin Clark-Casey (justincc) | 2011-07-31 | 1 | -1/+1 |
| | |||||
* | refactor: split out ninja joint part of SOP.DoPhysicsPropertyUpdate() so ↵ | Justin Clark-Casey (justincc) | 2011-07-31 | 1 | -71/+86 |
| | | | | that we don't have to look at it if it's not relevant | ||||
* | Remove _mesh field since the mesh data no longer needs to be stored after ↵ | Justin Clark-Casey (justincc) | 2011-07-31 | 1 | -49/+16 |
| | | | | | | it's initially used. This may improve memory usage for regions using mesh and sculpts, though I suspect that it doesn't address the current memory leak. | ||||
* | refactor: Remove argument to pass in an initial mesh to OdePrim since this ↵ | Justin Clark-Casey (justincc) | 2011-07-31 | 2 | -27/+5 |
| | | | | | | is no longer required and it prevents removal of the _mesh field (which is only used temporarily) If passing in a mesh becomes important again in the future then this can be reinstated. | ||||
* | minor: correct method doc for last commit | Justin Clark-Casey (justincc) | 2011-07-31 | 1 | -1/+1 |
| | |||||
* | refactor: rename CreateGeom _mesh argument to mesh, so as to not confuse ↵ | Justin Clark-Casey (justincc) | 2011-07-31 | 1 | -3/+3 |
| | | | | this with the pre-existing _mesh field | ||||
* | minor: method doc | Justin Clark-Casey (justincc) | 2011-07-31 | 2 | -4/+20 |
| | |||||
* | 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. | ||||
* | 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 |
| | |||||
* | 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 | 5 | -5/+12 |
| | |||||
* | Pass the first name and last name from the agent circuit data to the ↵ | Justin Clark-Casey (justincc) | 2011-07-23 | 3 | -19/+27 |
| | | | | | | | | | | 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 | ||||
* | Fixed serverside_object_permission default value confliction | Makopoppo | 2011-07-23 | 1 | -1/+1 |
| | |||||
* | For default everyone permissions on library items, make notecards and ↵ | Justin Clark-Casey (justincc) | 2011-07-23 | 1 | -8/+4 |
| | | | | | | | | | | 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 | 3 | -2/+15 |
| | | | | | | | 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 | 3 | -15/+2 |
| | | | | | | | | 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 | 3 | -2/+15 |
| | | | | | | 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 | ||||
* | 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 | 1 | -14/+0 |
|\ | |||||
| * | Removed unused AddPrimShape methods in PhysicsScene caused by merge conflicts | Dan Lake | 2011-07-20 | 1 | -14/+0 |
| | | |||||
* | | 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 | 1 | -10/+17 |
|/ | | | | 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. | ||||
* | If we store an undo, wipe anything already present on the redo stack | Justin Clark-Casey (justincc) | 2011-07-19 | 1 | -0/+3 |
| | | | | | This stops problems when we undo a few steps and start off down another path. Surprisingly, apart from this now fixed problem, redo appears to be working too. |