| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | Merge branch 'master' into careminster | Melanie | 2012-08-04 | 18 | -113/+215 | |
| | |\ \ | | |/ | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | |||||
| | | * | Strip experimental tag from --publish option of "save oar" region console ↵ | Justin Clark-Casey (justincc) | 2012-08-03 | 1 | -8/+7 | |
| | | | | | | | | | | | | | command | |||||
| | | * | Fix old regression that stopped saving parcel owner data in OARs. | Justin Clark-Casey (justincc) | 2012-08-03 | 3 | -36/+73 | |
| | | | | | | | | | | | | | | | | | | | This was working in 0.7.2 but was accidentally removed from 0.7.3. The --publish option for "save oar" will now save oars stripped of parcel owner information as well as scene object info. Please use the --publish option if you want to publish oars that may be later loaded by others to the same grid from which they were saved. | |||||
| | | * | Fix build break. | Justin Clark-Casey (justincc) | 2012-08-03 | 1 | -1/+1 | |
| | | | | ||||||
| | | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Robert Adams | 2012-08-03 | 1 | -4/+4 | |
| | | |\ | ||||||
| | | | * | Update settings loading in AvatarFactoryModule which should have been in ↵ | Justin Clark-Casey (justincc) | 2012-08-03 | 1 | -4/+4 | |
| | | | | | | | | | | | | | | | | | last commit 205f2326 | |||||
| | | * | | BulletSim: update DLLs and SOs | Robert Adams | 2012-08-03 | 4 | -0/+0 | |
| | | | | | ||||||
| | | * | | BulletSim: pass collision subscription information to the C++ code so ↵ | Robert Adams | 2012-08-03 | 3 | -16/+45 | |
| | | | | | | | | | | | | | | | | | collisions on objects that don't care are not reported up. | |||||
| | | * | | BulletSim: Add AddObjectForce to BulletSim API. | Robert Adams | 2012-08-03 | 3 | -20/+38 | |
| | | |/ | | | | | | | | | | | | | | | | Add interface 2 enhancements to BSCharacter. Modify AddForce and SetForce to use the new Bullet interface. More DetailLog statements for character. | |||||
| | | * | Consolidate PersistBakedTextures, DelayBeforeAppearanceSend and ↵ | Justin Clark-Casey (justincc) | 2012-08-03 | 3 | -23/+23 | |
| | | | | | | | | | | | | | | | | | | | DelayBeforeAppearanceSave into [Appearance] section from [Startup] config section so that all appearance settings are in the same place and not in the startup bucket. All these settings are in OpenSimDefaults.ini only. If you are using them then please adjust your OpenSim.ini | |||||
| | | * | Restore SOG constructor chaining removed in recent 513b77b. This is not a ↵ | Justin Clark-Casey (justincc) | 2012-08-03 | 1 | -1/+1 | |
| | | | | | | | | | | | | | functional change. | |||||
| | | * | Fix the recent windows compile error by putting newFont for case "R" in ↵ | Justin Clark-Casey (justincc) | 2012-08-03 | 1 | -3/+8 | |
| | | | | | | | | | | | | | VectorRenderModule inside its own context, rather than disposing of the old font before using it as a prototype for the new. | |||||
| | | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-08-03 | 1 | -2/+2 | |
| | | |\ | ||||||
| | | | * | attempting to fix a build issue | SignpostMarv | 2012-08-03 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com> | |||||
| | | * | | Move previously unadvertised SendPeriodicAppearanceUpdates setting from ↵ | Justin Clark-Casey (justincc) | 2012-08-03 | 2 | -2/+15 | |
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | [Startup] to [Appearance] config section. Add description and default of false (as before) to OpenSimDefaults.ini If set to true, this config switch will resend avatar appearance information (a small amount of UUID data, not the baked textures themselves) to other avatars in the sim every 60 seconds. For me, this has helped with situations where avatars appear persistently grey - the LL viewer sometimes did not appear to request assets the first time the appearance data was sent. However, this switch will not help with other appearance failure situations (e.g. failure to bake assets). This setting is experimental but will not have any significant impact on the simulator if turned to true. | |||||
| * | | | Merge branch 'avination' into ubitwork | UbitUmarov | 2012-08-07 | 1 | -0/+6 | |
| |\ \ \ | ||||||
| | * \ \ | Merge branch 'avination' of ssh://melanie@3dhosting.de/var/git/careminster ↵ | Melanie | 2012-08-07 | 1 | -0/+7 | |
| | |\ \ \ | | | | | | | | | | | | | | | | into avination | |||||
| | * | | | | Release http-in URLs when llResetScript is called | Melanie | 2012-08-07 | 1 | -0/+6 | |
| | | | | | | ||||||
| * | | | | | use a bit more complex mesh key identifier, plus a bug fix | UbitUmarov | 2012-08-07 | 3 | -29/+96 | |
| | | | | | | ||||||
| * | | | | | *** TESTTTTT ** downgrade from .net 4.0 to .net3.5 | UbitUmarov | 2012-08-06 | 1 | -97/+97 | |
| | | | | | | ||||||
| * | | | | | ** DANGER someone should stress test more ** release unused physics meshs, ↵ | UbitUmarov | 2012-08-06 | 7 | -55/+174 | |
| | | | | | | | | | | | | | | | | | | | | | including unmanaged memory allocations (allocated by managed code) | |||||
| * | | | | | bug fix: keep sculpt bitmaps border pixels during resolution scaling. | UbitUmarov | 2012-08-05 | 3 | -15/+78 | |
| | | | | | | | | | | | | | | | | | | | | | let this eventually have diferent interpolator last steps on each direction as sl seems to do. | |||||
| * | | | | | ubitmeshing: mask out mirror and invert bits on sculpttype convertion. | UbitUmarov | 2012-08-05 | 3 | -449/+12 | |
| | | | | | | | | | | | | | | | | | | | | | Remove some unused | |||||
| * | | | | | *feature test* ubitode, let convex hull shape type work for prims other | UbitUmarov | 2012-08-04 | 1 | -6/+15 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | than uploaded meshs, making it change the mesh level of detail from high to low. This will work on all prims that get a internal mesh or sculpts. Mesh size reduction will depend on particular shape. This is not as SL. There prims do also get concave areas. Uploaded meshs work as before. A normal 10x10x10 torus gets 152 vertices in place of 900, and 198 faces in place of 1198. | |||||
| * | | | | | fix build on win | UbitUmarov | 2012-08-04 | 1 | -2/+2 | |
| | | | | | | ||||||
| * | | | | | update ode.dll for windows so both 32b and 64b are now version 0.12 (32b | UbitUmarov | 2012-08-04 | 2 | -0/+0 | |
| | |/ / / |/| | | | | | | | | | | | is just a rebuild) | |||||
| * | | | | Merge branch 'ubitwork' into avination | Melanie | 2012-08-03 | 1 | -0/+7 | |
| |\ \ \ \ | |/ / / |/| | | | ||||||
| | * | | | on presence close(), release animator and OnRegionHeartbeatEnd event | UbitUmarov | 2012-08-03 | 1 | -0/+7 | |
| | | | | | ||||||
| * | | | | Merge branch 'careminster' into avination | Melanie | 2012-08-03 | 20 | -299/+459 | |
| |\ \ \ \ | | |/ / | |/| | | ||||||
| | * | | | Merge branch 'master' into careminster | Melanie | 2012-08-03 | 20 | -299/+459 | |
| | |\ \ \ | | | |/ | | |/| | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||||
| | | * | | refactor: rename SOG.RezzingObjectID to SOG.FromPartID to match ↵ | Justin Clark-Casey (justincc) | 2012-08-03 | 3 | -3/+3 | |
| | | | | | | | | | | | | | | | | | FromFolderID, FromItemID and to reflect that it's a SOP ID rather than a SOG ID. | |||||
| | | * | | Don't bothre setting RezzingObjectID to UUID.Zero in SOG constructor - this ↵ | Justin Clark-Casey (justincc) | 2012-08-03 | 1 | -3/+4 | |
| | | | | | | | | | | | | | | | | | is already its default value as it's a struct. | |||||
| | | * | | ImprovedTerseObjectUpdate packet does not support shape updates, thus ↵ | SignpostMarv | 2012-08-03 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | scheduling terse updates will not (and does not) update shape information in the viewer | |||||
| | | * | | Fixed a rare bug that caused Save OAR to fail because it thought it had ↵ | Oren Hurvitz | 2012-08-03 | 1 | -5/+11 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | timed-out The bug manifested as follows: a large world was saved. All the assets were found. But for some unknown reason, the timeout timer was restarted. So after 1 minute it closed the Archive Writer, because it didn't receive any more assets during that minute. That caused the OAR to become corrupted because ArchiveWriteRequestExecution.Save() was still running. | |||||
| | | * | | Save membership fee to the database when a group is created. | Kevin Cozens | 2012-08-03 | 1 | -25/+25 | |
| | | | | | ||||||
| | | * | | BulletSim: Debugging log statements added. Reduced size of updata buffer ↵ | Robert Adams | 2012-08-02 | 7 | -7/+28 | |
| | | | | | | | | | | | | | | | | | trying to find a corrupted memory problem. Update DLL and SO. | |||||
| | | * | | minor: Comment out "Deleting asset" log messages for now | Justin Clark-Casey (justincc) | 2012-08-03 | 2 | -2/+4 | |
| | | | | | ||||||
| | | * | | Delete old blank SOGSpamTest | Justin Clark-Casey (justincc) | 2012-08-03 | 1 | -37/+0 | |
| | | | | | ||||||
| | | * | | Properly dispose of all GDI+ entities used in VectorRenderModule for dynamic ↵ | Justin Clark-Casey (justincc) | 2012-08-03 | 1 | -253/+316 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | textures. The convention is that if an object implements IDiposable() the code must explicitly call Dispose() or call it via the using statement. This may be particularly important for GDI+ objects since they encapsulate native code entities. | |||||
| | | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-08-02 | 8 | -4/+55 | |
| | | |\ \ | ||||||
| | | | * | | Initialize the Rezzing object to UUID.Zero | Melanie | 2012-08-02 | 1 | -3/+4 | |
| | | | | | | ||||||
| | | | * | | reduced-complexity implementation of function to get rezzing object key | SignpostMarv | 2012-08-02 | 5 | -1/+29 | |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com> | |||||
| | | * | | | Add simple draw test for the VectorRenderModule | Justin Clark-Casey (justincc) | 2012-08-02 | 2 | -1/+76 | |
| | | | | | | ||||||
| * | | | | | Make WaitGetScenePresence wait for up to 20 seconds | Melanie | 2012-08-03 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | Remove another superflouous IsActive set | Melanie | 2012-08-03 | 1 | -2/+0 | |
| | |_|_|/ |/| | | | ||||||
| * | | | | Remove a merge artefaci in IsActive handling and restore commented out ↵ | Melanie | 2012-08-03 | 1 | -2/+1 | |
| | | | | | | | | | | | | | | | | | correct one | |||||
| * | | | | minor change avoiding a null reference | UbitUmarov | 2012-08-03 | 1 | -2/+4 | |
| | | | | | ||||||
| * | | | | clientview IsActive use is broken. Suspend it's use keeping it true ( to | UbitUmarov | 2012-08-03 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | | | | review later) | |||||
| * | | | | Make sure the position of a loggin-in agent is within region boundaries since | Melanie | 2012-08-03 | 1 | -0/+9 | |
| | | | | | | | | | | | | | | | | | out of bounds positions cause a rejection of the login. | |||||
| * | | | | Add a reason message for a code path that lacks one | Melanie | 2012-08-03 | 1 | -0/+1 | |
| |/ / / | ||||||
 |
index : opensim-SC_OLD | |
| My fork of OpenSim for IG and MG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |