| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | | | | | minor: Add region name to dropped inbound packet message | Justin Clark-Casey (justincc) | 2012-04-26 | 1 | -1/+3 | |
| | | |_|/ / / | |/| | | | | ||||||
| | * | | | | | Add request verb and url to error messages in WebUtil that lack this. | Justin Clark-Casey (justincc) | 2012-04-26 | 1 | -17/+38 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Make exception printing consistent across windows and mono. | |||||
| | * | | | | | minor: Add avatar name to removing agent log message | Justin Clark-Casey (justincc) | 2012-04-26 | 1 | -2/+2 | |
| | | | | | | | ||||||
| | * | | | | | Comment out avatar move to target message for now. | Justin Clark-Casey (justincc) | 2012-04-25 | 1 | -3/+3 | |
| | | |/ / / | |/| | | | ||||||
| | * | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Mic Bowman | 2012-04-25 | 2 | -7/+47 | |
| | |\ \ \ \ | ||||||
| | | * | | | | Port Avination link order to make OpenSim behave like SL. Make Primstar ↵ | Melanie | 2012-04-25 | 2 | -7/+47 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | scripts work. Fixes Mantis #5990 | |||||
| | * | | | | | 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://melanie@3dhosting.de/var/git/careminster into ↵ | Melanie | 2012-04-27 | 5 | -22/+54 | |
| |\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | careminster | |||||
| | * | | | | revert last add commit | UbitUmarov | 2012-04-26 | 1 | -2/+3 | |
| | | | | | | ||||||
| | * | | | | add wearable type PHYSICS | UbitUmarov | 2012-04-26 | 1 | -6/+13 | |
| | | | | | | ||||||
| | * | | | | Help big boobies to dance (avatar visualParams). May not persist and need ↵ | UbitUmarov | 2012-04-26 | 4 | -17/+41 | |
| | | | | | | | | | | | | | | | | | | | | | more lobe ? | |||||
| * | | | | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵ | Melanie | 2012-04-25 | 7 | -53/+158 | |
| |\ \ \ \ \ | |/ / / / | | | | | | | | | | | careminster | |||||
| | * | | | | set PIDHoverTau and not PIDTau since all physics need that | UbitUmarov | 2012-04-25 | 1 | -5/+7 | |
| | | | | | | ||||||
| | * | | | | fix chODE loosing some part positions when doing isPhysical false | UbitUmarov | 2012-04-24 | 2 | -11/+42 | |
| | | | | | | ||||||
| | * | | | | SOG bug fix in UI object changes | UbitUmarov | 2012-04-24 | 1 | -11/+20 | |
| | | | | | | ||||||
| | * | | | | fix animations if sited in ground also | UbitUmarov | 2012-04-24 | 1 | -1/+1 | |
| | | | | | | ||||||
| | * | | | | let objects/avas push avas | UbitUmarov | 2012-04-24 | 1 | -2/+1 | |
| | | | | | | ||||||
| | * | | | | "save the catgirls" | UbitUmarov | 2012-04-24 | 2 | -18/+13 | |
| | | | | | | ||||||
| | * | | | | display heatbeat sleep time in stats. This may not be good for general use, ↵ | UbitUmarov | 2012-04-24 | 1 | -0/+5 | |
| | | | | | | | | | | | | | | | | | | | | | but for testing/debug | |||||
| | * | | | | fix Simulation time report | UbitUmarov | 2012-04-24 | 1 | -0/+7 | |
| | | | | | | ||||||
| | * | | | | some reduction on time resolution efects on spare time report | UbitUmarov | 2012-04-24 | 1 | -4/+8 | |
| | | | | | | ||||||
| | * | | | | *testing* changed stats time reports to be per reported frame and not ↵ | UbitUmarov | 2012-04-24 | 1 | -11/+64 | |
| | | | | | | | | | | | | | | | | | | | | | acumulated in about 1second. Total Frame Time is not just 1/reported sim fps | |||||
| * | | | | | 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. | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |