| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into careminster | Melanie | 2012-04-20 | 1 | -12/+10 |
| |\ | |||||
| | * | 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 | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-04-20 | 5 | -53/+106 |
| |\ \ | |/ | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs | ||||
| | * | 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 | ||||
| | * | Remember to dispose of the bitmap opened from a file in ↵ | Justin Clark-Casey (justincc) | 2012-04-20 | 1 | -4/+11 |
| | | | | | | | | | GatekeeperServiceConnector.GetMapImage() | ||||
| | * | 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> | ||||
| | * | Add more exception detail to Exception and IOException throws in ↵ | Justin Clark-Casey (justincc) | 2012-04-20 | 1 | -2/+2 |
| | | | | | | | | | BaseHttpServer.HandleRequest() | ||||
| | * | 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 ssh://melanie@3dhosting.de/var/git/careminster into ↵ | Melanie | 2012-04-20 | 9 | -221/+170 |
| |\ \ | | | | | | | | | | careminster | ||||
| | * | | changed - VolumeDetect and phantom setting interaction. Script VD(true) ↵ | UbitUmarov | 2012-04-19 | 2 | -13/+40 |
| | | | | | | | | | | | | | forces phantom ON. UI phantom off turns off VD. Other transitions should only change specific parameter. This is not as current SL. - Fixed volumedetect prims being wrongly removed from physics. | ||||
| | * | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork | UbitUmarov | 2012-04-19 | 6 | -4/+28 |
| | |\ \ | |||||
| | | * | | Allow setting a specific target velocity on TeleportWithMomentum | Melanie | 2012-04-18 | 1 | -1/+11 |
| | | | | | |||||
| | | * | | Allow scripts in attachments owned by the NPC to control the NPC | Melanie | 2012-04-18 | 1 | -1/+7 |
| | | | | | |||||
| | | * | | Prevent objects rezzed in sim from being seen as attachments and becoming ↵ | Melanie | 2012-04-17 | 2 | -0/+8 |
| | | | | | | | | | | | | | | | | | uneditable or crashers. (Foxtail of death) | ||||
| | * | | | ubitODE still retouching character pid | UbitUmarov | 2012-04-18 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | ubitODE - retouch character PIDs | UbitUmarov | 2012-04-18 | 1 | -4/+4 |
| | | | | | |||||
| | * | | | ubitODE: prims - update managed dinamic parameters from unmanaged at ODE ↵ | UbitUmarov | 2012-04-17 | 1 | -78/+46 |
| | | | | | | | | | | | | | | | | | rate and not heartbeat. | ||||
| | * | | | ubitODE: - character managed ode was only getting position etc from ↵ | UbitUmarov | 2012-04-17 | 2 | -119/+48 |
| | | | | | | | | | | | | | | | | | unmanaged at heartbeat rate like core ode. Now do it at ODE rate in move(..). UpdatePositionAndVelocity() called once per heartbeat is now empty. | ||||
| | * | | | ubitODE: - made avatar/ground collision pid servo a bit softer since seems a ↵ | UbitUmarov | 2012-04-17 | 2 | -6/+7 |
| | | | | | | | | | | | | | | | | | bit unstable with small avas in AVI even if fine on my testsite - Removed reading of PID parameters from config files since that only serves to mess things up and adds more unknowns | ||||
| * | | | | Fx up estate settings | Melanie | 2012-04-18 | 2 | -97/+97 |
| | | | | | |||||
| * | | | | Merge branch 'master' into careminster | Melanie | 2012-04-18 | 2 | -4/+8 |
| |\ \ \ \ | | |_|/ | |/| | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | ||||
| | * | | | 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' into careminster | Melanie | 2012-04-18 | 9 | -2/+1534 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-04-18 | 6 | -1/+1475 |
| | |\ \ \ | |||||
| | | * | | | clean up some more logging spam in the jsonstore modules | Mic Bowman | 2012-04-17 | 2 | -2/+4 |
| | | | | | | |||||
| | | * | | | Fix the Csharp 3.0 vs 4.0 problem in JsonStore initialization. | Mic Bowman | 2012-04-17 | 3 | -5/+7 |
| | | | | | | | | | | | | | | | | | | | | | Cut down on the logging spam. | ||||
| | | * | | | add configuration for jsonstore module, disabled by default | Mic Bowman | 2012-04-17 | 1 | -0/+6 |
| | | | | | | |||||
| | | * | | | This commit adds a new optional region module, JsonStore, that provides ↵ | Mic Bowman | 2012-04-17 | 4 | -0/+1464 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | structured storage (dictionaries and arrays of string values) for scripts and region modules. In addition, there are operations on the storage that enable "real" distributed computation between scripts through operations similar to those of a tuple space. Scripts can share task queues, implement shared locks or semaphores, etc. The structured store is limited to the current region and is not currently persisted. However, script operations are defined to initialize a store from a notecard and to serialize the store to a notecard. Documentation will be posted to the opensim wiki soon. | ||||
| | | * | | | make the namespace for the ScriptModuleComms consistent with its file system ↵ | Mic Bowman | 2012-04-17 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | location | ||||
| | * | | | | 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 TestGetChildPartPositionAfterObjectRotation() | Justin Clark-Casey (justincc) | 2012-04-17 | 1 | -1/+37 |
| | | | | | |||||
| * | | | | Merge branch 'master' into careminster | Melanie | 2012-04-17 | 11 | -139/+76 |
| |\ \ \ \ | |/ / / | | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| | * | | | Add test TestGetChildPartPosition() | Justin Clark-Casey (justincc) | 2012-04-17 | 1 | -0/+28 |
| | | | | | |||||
| | * | | | Move some public methods on WebStatsModule to private to reduce some static ↵ | Justin Clark-Casey (justincc) | 2012-04-17 | 1 | -14/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | analysis complexity. There's no obvious reason for these methods to be public. | ||||
| | * | | | refactor: Rename EstateSettings.IsEstateManager() to ↵ | Justin Clark-Casey (justincc) | 2012-04-17 | 9 | -16/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | EstateSettings.IsEstateManagerOrOwner() to reflect what it actually does. This makes it consistent with other parts of OpenSimulator that are treating ESTATE_MANAGER and ESTATE_OWNER as different entities. As per opensim-dev mailing list. | ||||
| | * | | | Null reference in llGetObjectMass on a seated avatar. | Talun | 2012-04-17 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Use INSERT OR REPLACE INTO sql in WebStatsModule for session update rather ↵ | Justin Clark-Casey (justincc) | 2012-04-17 | 1 | -77/+7 |
| | | | | | | | | | | | | | | | | | than separate insert and update statements | ||||
| | * | | | correct bug where f_invalid was being inserted on a webstats update for an ↵ | Justin Clark-Casey (justincc) | 2012-04-17 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | existing session rather than d_world_kb | ||||
| | * | | | Simplify WebStatsModule by removing the uncompleted migrations section. | Justin Clark-Casey (justincc) | 2012-04-17 | 1 | -29/+3 |
| | | | | | | | | | | | | | | | | | | | | | Use "create table if not exists" instead. Client stats data is transitory data that it is not worth migrating. | ||||
| | * | | | Fix bug in WebStatsModule where an exception would always be output on ↵ | Justin Clark-Casey (justincc) | 2012-04-17 | 1 | -5/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update if the user teleported to another region on that simulator. This was because update was looking for an existing stats record unique in session id, agent id and region id. But if the user teleports to another region then region id changes. WebStatsModule promptly doesn't find the existing record and tries to insert a new one, but only session id is the primary key and that's still the same, which makes things go bang. This makes the update search only on the unique session id. This is only an issue with simulators that have multiple regions where the webstats module is enabled. | ||||
| * | | | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵ | Melanie | 2012-04-17 | 13 | -766/+1167 |
| |\ \ \ \ | | |_|/ | |/| | | | | | | careminster | ||||
| | * | | | Merge branch 'ubitwork' | Melanie | 2012-04-17 | 2 | -2/+24 |
| | |\ \ \ | | | |/ | | |/| | |||||
| | | * | | ubitODE: bug fix let avatars colide with volume detectors | UbitUmarov | 2012-04-17 | 1 | -0/+1 |
| | | | | | |||||
| | | * | | fix (http://opensimulator.org/mantis/view.php?id=5965) llGetObjectMass was ↵ | UbitUmarov | 2012-04-16 | 1 | -2/+23 |
| | | | | | | | | | | | | | | | | | bad for sitted avatars not checking for the null physicsactor | ||||
| | * | | | Merge branch 'ubitwork' | Melanie | 2012-04-16 | 2 | -8/+16 |
| | |\ \ \ | | |/ / | |||||
| | | * | | ubitODE: - fix remove characters from default raycasts filters as older code ↵ | UbitUmarov | 2012-04-16 | 2 | -8/+16 |
| | | | | | | | | | | | | | | | | | (or camera is very odd) - Slow down avatar if velocity is higher than 50m/s as in chODE | ||||
 |
index : opensim-SC_OLD | |
| My fork of OpenSim for IG and MG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |