| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | | | | Port Avination link order to make OpenSim behave like SL. Make Primstar ↵ | Melanie | 2012-04-25 | 2 | -7/+47 | |
| | | |/ / / | |/| | | | | | | | | | | | | | scripts work. Fixes Mantis #5990 | |||||
| * | | | | | Merge branch 'master' into careminster | Melanie | 2012-04-25 | 1 | -15/+24 | |
| |\ \ \ \ \ | |/ / / / | ||||||
| | * | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Mic Bowman | 2012-04-25 | 50 | -801/+1393 | |
| | |\ \ \ \ | | | |_|/ | | |/| | | ||||||
| | * | | | | 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 | |||||
| * | | | | | Adapt some TeleportWithMomentum calls | Melanie | 2012-04-25 | 2 | -2/+2 | |
| | | | | | | ||||||
| * | | | | | Merge branch 'master' into careminster | Melanie | 2012-04-25 | 3 | -19/+15 | |
| |\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||||
| | * | | | | 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 | |
| | |/ / / / | ||||||
| * | | | | | Merge branch 'master' into careminster | Melanie | 2012-04-25 | 5 | -11/+40 | |
| |\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||||
| | * | | | | 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 AvatarService.SetAvatar debug log line for now | Justin Clark-Casey (justincc) | 2012-04-25 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | Merge branch 'master' into careminster | Melanie | 2012-04-25 | 8 | -55/+76 | |
| |\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs | |||||
| | * | | | | 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 | |
| | | | | | | ||||||
| | * | | | | Go back to always using the local timezone for now - not all machines have ↵ | Justin Clark-Casey (justincc) | 2012-04-24 | 1 | -13/+18 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | US/Pacific or Olsen Amercia/Los_Angeles and this introduces variability that the server operator cannot control Please see http://opensimulator.org/mantis/view.php?id=5972 soon for more comments. | |||||
| | * | | | | Revert "Refactored how asset/inventory types are associated with content ↵ | Justin Clark-Casey (justincc) | 2012-04-24 | 2 | -177/+228 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | types: gathered all the knowledge into a single class. Added the Mesh content type." This reverts commit d3a4d67a207976cd0d116bb9021f7dfc896784e8. Accidentally committed this when I didn't mean to yet. | |||||
| | * | | | | Minor improvements to logging | Oren Hurvitz | 2012-04-24 | 6 | -12/+24 | |
| | | | | | | | | | | | | | | | | | | | | | Eliminated an extra newline in the console if the log line doesn't contain a category (example of a category: "[ASSETS]"). | |||||
| | * | | | | Refactored how asset/inventory types are associated with content types: ↵ | Oren Hurvitz | 2012-04-24 | 2 | -228/+177 | |
| | | | | | | | | | | | | | | | | | | | | | gathered all the knowledge into a single class. Added the Mesh content type. | |||||
| * | | | | | Merge branch 'master' into careminster | Melanie | 2012-04-24 | 15 | -355/+298 | |
| |\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Warp3DMap/MapImageModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||||
| | * | | | | Fixed problem with MySQL: it was possible for one thread to use an ↵ | Oren Hurvitz | 2012-04-24 | 3 | -21/+37 | |
| | | | | | | | | | | | | | | | | | | | | | incomplete list of column names if another thread was creating the list at the same time. Now this is thread-safe. | |||||
| | * | | | | When reading a region, use null objects to represent NULL fields. | Oren Hurvitz | 2012-04-24 | 1 | -1/+5 | |
| | | | | | | | | | | | | | | | | | | | | | Previously NULL fields were converted to an empty string due to the use of ToString(). But if the field was an Int (e.g., "locZ"), then the subsequent attempt to convert an empty string to an int caused an exception. Now the field is null so we don't try to convert it, so there's no exception. | |||||
| | * | | | | OSSL: fixed the threat level check for osParseJSONNew | Oren Hurvitz | 2012-04-24 | 1 | -1/+1 | |
| | | | | | | ||||||
| | * | | | | minor: formatting changes to top of LLLoginResponse.SetDefaultValues(), ↵ | Justin Clark-Casey (justincc) | 2012-04-24 | 1 | -1/+6 | |
| | | | | | | | | | | | | | | | | | | | | | chiefly some break up of the long line. | |||||
| | * | | | | DST settings to match client default Pacific Time (mantis #5972) | Olivier van Helden and Gudule Lapointe (Speculoos.net) | 2012-04-24 | 1 | -1/+15 | |
| | | | | | | ||||||
| | * | | | | 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 | 6 | -58/+120 | |
| | |\ \ \ \ | | | |_|/ | | |/| | | ||||||
| | * | | | | 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. | |||||
| * | | | | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵ | Melanie | 2012-04-23 | 7 | -502/+617 | |
| |\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | careminster | |||||
| | * | | | | ubitODE - do own timing control (as chODE does) until heartbeat does it right | UbitUmarov | 2012-04-23 | 2 | -21/+34 | |
| | | | | | | ||||||
| | * | | | | ubitODE - several changes... | UbitUmarov | 2012-04-23 | 3 | -431/+379 | |
| | | | | | | ||||||
| | * | | | | fix a bug i added fixing another.... | UbitUmarov | 2012-04-22 | 1 | -2/+5 | |
| | | | | | | ||||||
| | * | | | | ubitODE: - don't try to hover underground unless volumedetector (that ↵ | UbitUmarov | 2012-04-21 | 1 | -47/+93 | |
| | | | | | | | | | | | | | | | | | | | | | doesn't colide with it) | |||||
| | * | | | | changed seletion code. SOP now knows about parts selection. UI actions are ↵ | UbitUmarov | 2012-04-20 | 3 | -24/+104 | |
| | | | | | | | | | | | | | | | | | | | | | sent to SOP and this reports to SOG. Group is selected if any part is selected.sop.isSelect get() is only used in SOG. Will need to be improved for better performance on largelinksets. *UNTESTED* NEEDS CHECKING for side efects | |||||
| | * | | | | ubitODE: - Change triangles used in terrain height estimation | UbitUmarov | 2012-04-20 | 1 | -11/+28 | |
| | | | | | | ||||||
| | * | | | | ubitODE - again avatar/terrain collision. Reduce new viewers interpolators ↵ | UbitUmarov | 2012-04-20 | 1 | -6/+14 | |
| | | | | | | | | | | | | | | | | | | | | | efects reporting null velocity and aceleration when stopped near the right position, where they can still have instantanius large values that can get magnified by interpolators, specially using diferent timing estimation. | |||||
| * | | | | | Merge branch 'master' into careminster | Melanie | 2012-04-23 | 14 | -124/+473 | |
| |\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||||
| | * | | | | Mantis 5977 Corrections to llRegionSayTo | Talun | 2012-04-23 | 6 | -58/+120 | |
| | | |/ / | |/| | | | | | | | | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com> | |||||
| | * | | | 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. | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |