| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Add a configuration switch to turn on/off the use of the trash | Mic Bowman | 2012-04-25 | 2 | -1/+3 |
| | | | | | | | | | | folder when deleting objects from a scene. The use of the trash folder causes assets to be created and stored everytime you delete an object from the scene (slows down the delete and adds mostly useless assets to your database). Default is on (use the trash folder) which is the standard behavior. | ||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Mic Bowman | 2012-04-25 | 39 | -769/+1283 |
| |\ | |||||
| | * | Slight rewording of output messages. | Diva Canto | 2012-04-24 | 1 | -1/+1 |
| | | | |||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-04-24 | 2 | -1/+13 |
| | |\ | |||||
| | | * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2012-04-25 | 1 | -0/+1 |
| | | |\ | |||||
| | | | * | zero out SP velocity before calling SP.Teleport(), as the client expects ↵ | Justin Clark-Casey (justincc) | 2012-04-25 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | (though this is also effectively done by physics at the moment) | ||||
| | | * | | Commit the avination Teleport() methods (adaptedto justincc's changes) | Melanie | 2012-04-25 | 1 | -1/+12 |
| | | |/ | |||||
| | * | | HG: Moved User-level code down to the HGEntityTransferModule where it belongs. | Diva Canto | 2012-04-24 | 2 | -14/+14 |
| | |/ | |||||
| | * | refactor: Combine ScenePresence.Teleport() and TeleportWithMomentum() | Justin Clark-Casey (justincc) | 2012-04-25 | 2 | -17/+1 |
| | | | | | | | | | These are identical apart from setting Velocity = zero, which has no practical effect anyway since this is zeroed when the avatar is added back to the physics scene. | ||||
| | * | Add regression test TestSameRegionTeleport() | Justin Clark-Casey (justincc) | 2012-04-25 | 3 | -1/+43 |
| | | | |||||
| | * | Comment out some debug ATTACHMENTS log messages for now. | Justin Clark-Casey (justincc) | 2012-04-25 | 1 | -15/+14 |
| | | | |||||
| | * | Comment out the noisier AVFACTORY log messages for now. | Justin Clark-Casey (justincc) | 2012-04-25 | 1 | -4/+6 |
| | | | | | | | | | Permanently comment out warnings about ScenePresence not being found - this is entirely expected if the avatar has alraedy logged out or left the scene. | ||||
| | * | Improve teleport log debug and error messages to tell us who is teleporting. | Justin Clark-Casey (justincc) | 2012-04-25 | 1 | -3/+14 |
| | | | |||||
| | * | Minor improvements to logging | Oren Hurvitz | 2012-04-24 | 4 | -11/+16 |
| | | | | | | | | | Eliminated an extra newline in the console if the log line doesn't contain a category (example of a category: "[ASSETS]"). | ||||
| | * | OSSL: fixed the threat level check for osParseJSONNew | Oren Hurvitz | 2012-04-24 | 1 | -1/+1 |
| | | | |||||
| | * | Restore _parent_scene.actor_name_map[prim_geom] = this; accidentally removed ↵ | Justin Clark-Casey (justincc) | 2012-04-24 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | from ODEPrim.SetGeom. This occurred in 7a574be3fd from Sat 21 Apr 2012. This should fix collision detection. Mnay thanks to tglion for the spot and the fix in http://opensimulator.org/mantis/view.php?id=5988 | ||||
| | * | Changed the Map-related messages from Info to Debug. They're debug messages. | Diva Canto | 2012-04-23 | 4 | -8/+8 |
| | | | |||||
| | * | Add online/offline indicator to "friends show" region console command. | Justin Clark-Casey (justincc) | 2012-04-24 | 1 | -3/+14 |
| | | | | | | | | | Improve output table formatting. | ||||
| | * | Add osForceAttachToAvatar() and osForceDetachFromAvatar() | Justin Clark-Casey (justincc) | 2012-04-24 | 6 | -49/+127 |
| | | | | | | | | | | | | | These behave identically to llAttachToAvatar() and llDetachFromAvatar() except that they do not enforce the PERMISSION_ATTACH check Intended for use in completely controlled dedicated environments where these checks are more a UI hinderance than a help. Threat level high. | ||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-04-23 | 5 | -58/+100 |
| | |\ | |||||
| | | * | Mantis 5977 Corrections to llRegionSayTo | Talun | 2012-04-23 | 5 | -58/+100 |
| | | | | | | | | | | | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com> | ||||
| | * | | Replace common code to fetch self inventory item (as opposed to uuid) with ↵ | Justin Clark-Casey (justincc) | 2012-04-23 | 1 | -155/+76 |
| | | | | | | | | | | | | | | | | | | | GetSelfInventoryItem() However, at some point it would be far more convenient to receive the TaskInventoryItem in the constructor rather than just the item UUID, so we don't have to constantly refetch our self item. | ||||
| | * | | refactor: Replace calls to InventorySelf() with existing m_itemID in LSL_Api | Justin Clark-Casey (justincc) | 2012-04-23 | 1 | -94/+42 |
| | |/ | | | | | | | There's no point look up an item ID that we already have. | ||||
| | * | refactor: simply some properties code in BasicPhysicsPlugin | Justin Clark-Casey (justincc) | 2012-04-22 | 2 | -72/+12 |
| | | | |||||
| | * | Make TestSetPhysicsSinglePrim() actually add the object to the scene in ↵ | Justin Clark-Casey (justincc) | 2012-04-22 | 1 | -0/+2 |
| | | | | | | | | | order to test more code paths. | ||||
| | * | Fix bug where setting phantom on a prim would result in a server log message ↵ | Justin Clark-Casey (justincc) | 2012-04-22 | 6 | -32/+382 |
| | | | | | | | | | | | | | | | | | rather than setting phantom. This was an oversight when removing some race conditions from PhysicsActor setting recently. Regression tests extended to probe this code path. Extending regression tests required implementation of a BasicPhysicsPrim (there was none before). However, BasicPhysics plugin is still of no current practical use other than to fill in as a component for other parts of regression testing. | ||||
| | * | Comment out spurious Body != IntPtr.Zero code after disableBody(), since ↵ | Justin Clark-Casey (justincc) | 2012-04-21 | 2 | -10/+20 |
| | | | | | | | | | disableBody() sets Body == IntPtr.Zero on all code paths. | ||||
| | * | refactor: Simplify ODEPrim.AddChildPrim() by returning early where appropriate. | Justin Clark-Casey (justincc) | 2012-04-21 | 1 | -115/+117 |
| | | | |||||
| | * | Add test for setting physics in a linkset | Justin Clark-Casey (justincc) | 2012-04-21 | 1 | -2/+28 |
| | | | |||||
| | * | Add regression test for prim status when root prim in a new linkset is ↵ | Justin Clark-Casey (justincc) | 2012-04-21 | 2 | -1/+20 |
| | | | | | | | | | non-physical | ||||
| | * | Fix a bug where linking a non-physical prim with a physical prim as root ↵ | Justin Clark-Casey (justincc) | 2012-04-21 | 2 | -0/+22 |
| | | | | | | | | | | | | | | | | | would make the non-physical prim phantom rather than part of the physics object. On region restart, the whole object would become physical as expected. Observed behaviour from elsewhere is that all prims in a new linkset should take on the status of the root prim. Add regression test for this behaviour. | ||||
| | * | Add test for correct physics status on linking two physics objects | Justin Clark-Casey (justincc) | 2012-04-21 | 1 | -2/+26 |
| | | | | | | | | | Also fixes last build break. | ||||
| | * | refactor: extract common setup code in SceneObjectStatusTests | Justin Clark-Casey (justincc) | 2012-04-21 | 1 | -10/+16 |
| | | | |||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-04-21 | 2 | -120/+95 |
| | |\ | |||||
| | | * | Remove redundant prim_geom != IntPtr.Zero checks in ODEPrim. | Justin Clark-Casey (justincc) | 2012-04-21 | 1 | -116/+88 |
| | | | | | | | | | | | | | | | | | | | prim_geom == IntPtr.Zero only before a new add prim taint is processed (which is the first taint) or in operations such as scale change which are done in taint or under lock. Therefore, we can remove these checks which were not consistently applied anyway. If there is a genuine problem, better to see it quickly in a NullReferenceException than hide the bug. | ||||
| | | * | Improve bitmap disposal to do null checks and not to potentially try ↵ | Justin Clark-Casey (justincc) | 2012-04-20 | 1 | -4/+7 |
| | | | | | | | | | | | | | | | | | | | | | | disposal of uninitialized variables. This issue doesn't cause the mono 2.10.5 compiler to fail but appears to cause the windows compiler to fail. Resolves http://opensimulator.org/mantis/view.php?id=5973 | ||||
| | * | | Add TestSetPhysics() to SOP status tests | Justin Clark-Casey (justincc) | 2012-04-21 | 2 | -3/+26 |
| | |/ | |||||
| | * | If a physical prim is manually moved (e.g. by a user) then set the geometry ↵ | Justin Clark-Casey (justincc) | 2012-04-20 | 1 | -12/+10 |
| | | | | | | | | | | | | | | | position as well as the body position This is necessary to stop the moved prim snapping back to the original position on deselection if moved only once This resolves http://opensimulator.org/mantis/view.php?id=5966 | ||||
| | * | Always dispose of existing opened bitmap from file in SaveFile(), instead of ↵ | Justin Clark-Casey (justincc) | 2012-04-20 | 1 | -22/+37 |
| | | | | | | | | | simply dropping the reference if the existing file didn't contain a bitmap of the same size. | ||||
| | * | Explicitly dispose of bitmaps opened from files in GenericSystemDrawing and ↵ | Justin Clark-Casey (justincc) | 2012-04-20 | 2 | -18/+31 |
| | | | | | | | | | JPEG.cs | ||||
| | * | concerns GenericSystemDrawing.cs | Garmin Kawaguichi | 2012-04-20 | 1 | -8/+9 |
| | | | | | | | | | | | | | | | | | in OpenSim\Region\CoreModules\World\Terrain\FileLoaders\GenericSystemDrawing.cs Ln 67 Apply Justin's solution Signed-off-by: Garmin Kawaguichi <garmin.kawaguichi@magalaxie.com> | ||||
| | * | Stop teleports from dropping tall avatars through or embedding them in the ↵ | Justin Clark-Casey (justincc) | 2012-04-20 | 1 | -1/+7 |
| | | | | | | | | | | | | | | | floor when lured by short avatars. This involves giving the ceiling of the Z-component in a lure rather than the floor. Ideally we would give the exact float compensating for relative avatar height but it looks like that isn't possible with the parcel id format used in lures | ||||
| | * | Fix a logic error in app domain creation | Melanie | 2012-04-18 | 1 | -1/+1 |
| | | | |||||
| | * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2012-04-18 | 1 | -1/+1 |
| | |\ | |||||
| | | * | On "show part" command, show link number. | Justin Clark-Casey (justincc) | 2012-04-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | This replaces the Parts count which was rather pointless for a prim (it was either 1 if a child or the number of parts if the root). This information is still avaliable on the "show object" command. | ||||
| | * | | Don't re-add the assembly resolver for each script if not creating the appdomain | Melanie | 2012-04-18 | 1 | -4/+8 |
| | |/ | |||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-04-18 | 5 | -1/+1469 |
| | |\ | |||||
| | * | | minor: Add some method doc. Add warnings since calling SOG link/delink ↵ | Justin Clark-Casey (justincc) | 2012-04-17 | 2 | -0/+22 |
| | | | | | | | | | | | | | methods directly rather than through Scene may allow race conditions. | ||||
| * | | | Add try/catch around Json script method registration to avoild some issues | Mic Bowman | 2012-04-25 | 1 | -15/+24 |
| | |/ |/| | | | | | | | | | with .NET 3.5 vs 4.0 differences. See http://opensimulator.org/mantis/view.php?id=5971 | ||||
| * | | clean up some more logging spam in the jsonstore modules | Mic Bowman | 2012-04-17 | 2 | -2/+4 |
| | | | |||||
 |
index : opensim-SC_OLD | |
| My fork of OpenSim for IG and MG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |