| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | | | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵ | Melanie | 2012-03-04 | 22 | -695/+1305 | |
| |\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | careminster | |||||
| | * | | | | | Zero velocity when drag-copying | Melanie | 2012-03-04 | 1 | -0/+2 | |
| | | |_|_|/ | |/| | | | ||||||
| | * | | | | This still causes terrain artefacts | Melanie | 2012-03-02 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert " fix my bug on ChODE terrain heightmap build" This reverts commit aa77d1d486f11da7dc841190f1ca85e085d0d648. | |||||
| | * | | | | This still causes terrain artefacts | Melanie | 2012-03-02 | 1 | -3/+1 | |
| | | |_|/ | |/| | | | | | | | | | | | | | | | | | | Revert " fix the last fix. Regions are square but... Also remove the 0.5 offset in map position. It was apparently needed to fix we having nsamples = size and not size + 1." This reverts commit 15bc539bd49e7a09c1ec6e539871cde5eee6032e. | |||||
| | * | | | Fix and hook up llTeleportAgent | Melanie | 2012-02-28 | 3 | -1/+7 | |
| | | | | | ||||||
| | * | | | Implement llTeleportAgent | Melanie | 2012-02-28 | 1 | -0/+22 | |
| | | |/ | |/| | ||||||
| | * | | made box a little larger | UbitUmarov | 2012-02-28 | 1 | -6/+6 | |
| | | | | ||||||
| | * | | A few blind changes to go try to go around bad mesh little box replacement fail | UbitUmarov | 2012-02-28 | 1 | -67/+50 | |
| | | | | ||||||
| | * | | Really dirty hack to make sims start. Causes errors but the ting runs. Remove | Melanie | 2012-02-28 | 1 | -1/+5 | |
| | | | | | | | | | | | | | when fixed right. | |||||
| | * | | Let inworld meshs colide as such and not as basic prim all the time. ↵ | UbitUmarov | 2012-02-27 | 2 | -5/+10 | |
| | | | | | | | | | | | | | Removed also LOD, and outerskin on colision meshs. | |||||
| | * | | Merge branch 'ubitwork' | Melanie | 2012-02-27 | 4 | -568/+378 | |
| | |\ \ | ||||||
| | | * | | update ubitODE to my current working state | UbitUmarov | 2012-02-27 | 4 | -568/+378 | |
| | | | | | ||||||
| | * | | | Fix vehicles going physical stopping llTargetOmega parts (boat radar) | Melanie | 2012-02-27 | 1 | -3/+5 | |
| | | | | | ||||||
| | * | | | Fix NPC appearance setting to include attachments again | Melanie | 2012-02-27 | 1 | -1/+4 | |
| | |/ / | ||||||
| | * | | Merge branch 'ubitwork' | Melanie | 2012-02-26 | 2 | -3/+41 | |
| | |\ \ | ||||||
| | | * | | added in chODE GeomTriMeshDataDestroy to explicity release internal trimesh ↵ | UbitUmarov | 2012-02-26 | 2 | -3/+41 | |
| | | | | | | | | | | | | | | | | | data. | |||||
| | | * | | Implement KeyframedMotion selection behavior | Melanie | 2012-02-26 | 3 | -2/+37 | |
| | | | | | ||||||
| | * | | | Make llSetKeyframedMotion prims waut at the borders of down sims and try again | Melanie | 2012-02-26 | 2 | -0/+18 | |
| | | | | | | | | | | | | | | | | | periodically. | |||||
| | * | | | Move KeyframeMotion from SOG to SOP because we can't persist it any | Melanie | 2012-02-26 | 7 | -39/+52 | |
| | | | | | | | | | | | | | | | | | other way because SOG doesn't technically exist in the DB | |||||
| | * | | | Implement proper selection behavior | Melanie | 2012-02-26 | 3 | -2/+37 | |
| | |/ / | ||||||
| | * | | Fix deserialization of Buoyancy, Force and Torque. Remove debug from the new | Melanie | 2012-02-26 | 5 | -11/+9 | |
| | | | | | | | | | | | | | code. | |||||
| | * | | Fix an infinite recursion caused by checking the wrong values for | Melanie | 2012-02-26 | 1 | -24/+27 | |
| | | | | | | | | | | | | | Buoyancy, Force and Torque | |||||
| | * | | Serialize Keyframe motion for region crossings | Melanie | 2012-02-26 | 4 | -4/+96 | |
| | | | | ||||||
| | * | | Zero force and torque on take so that items don't run away when rezzed | Melanie | 2012-02-26 | 1 | -0/+2 | |
| | | | | ||||||
| | * | | Merge branch 'ubitwork' | Melanie | 2012-02-26 | 3 | -35/+98 | |
| | |\ \ | ||||||
| | | * | | changed SOP Force and Torque, adding XML (de/)serialization, also changed ↵ | UbitUmarov | 2012-02-25 | 3 | -35/+98 | |
| | | | | | | | | | | | | | | | | | Buoyance. PLEASE trap deserialization from inventory etc, making force and torque vector3.Zero, unless we want then to rez moving. (needs checking/testing as usual) | |||||
| | * | | | Implement llSetKeyframedMotion. No persistence, no region crossing. Yet. | Melanie | 2012-02-26 | 9 | -2/+493 | |
| | |/ / | ||||||
| | * | | Delay the sending of the initial werables update until the inventory and | Melanie | 2012-02-25 | 2 | -8/+12 | |
| | | | | | | | | | | | | | | | | VFS in the viewer are ready. We're much faster than SL and that exposes this race condition. Also reinstate the extra avatar data send on login | |||||
| | * | | Merge branch 'ubitwork' | Melanie | 2012-02-24 | 1 | -5/+21 | |
| | |\ \ | ||||||
| | | * | | replace bad meshs by a small cube and log it. | UbitUmarov | 2012-02-24 | 1 | -5/+21 | |
| | | | | | ||||||
| | * | | | Try not to send the avatar updates on login. This may mean loggin in with | Melanie | 2012-02-24 | 1 | -1/+2 | |
| | |/ / | | | | | | | | | | invisible attachments again but could help the appearance issues. | |||||
| | * | | stop using useless geom tricallback. | UbitUmarov | 2012-02-24 | 1 | -1/+2 | |
| | | | | ||||||
| | * | | Prevent a nullref when nonphysical motion objects cross sim boundaries | Melanie | 2012-02-23 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Melanie | 2012-02-23 | 2 | -6/+9 | |
| | |\ \ | ||||||
| | * | | | Correct sit position calculations | Melanie | 2012-02-23 | 1 | -2/+2 | |
| | | | | | ||||||
| * | | | | Merge branch 'master' into careminster | Melanie | 2012-03-04 | 1 | -1/+1 | |
| |\ \ \ \ | | |_|/ | |/| | | | | | | | | | | Conflicts: OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs | |||||
| | * | | | comment out "[CAPS]: ScriptTaskInventory Request" log spam | Justin Clark-Casey (justincc) | 2012-03-02 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Merge branch 'master' into careminster | Melanie | 2012-03-03 | 12 | -221/+193 | |
| |\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||||
| | * | | | Remove outdated comment about checking attachment prims in ↵ | Justin Clark-Casey (justincc) | 2012-03-02 | 1 | -3/+1 | |
| | | | | | | | | | | | | | | | | | Scene.PipeEventsForScript() | |||||
| | * | | | Allow a script to receive events if its root prim is in an area where it's ↵ | Justin Clark-Casey (justincc) | 2012-03-02 | 1 | -4/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | allowed to run rather than checking its own prim. This allows scripts to run in child prims that are outside region boundaries. This is an interim patch applied from http://opensimulator.org/mantis/view.php?id=5899 though it does not resolve that bug Thanks tglion! | |||||
| | * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Dan Lake | 2012-03-02 | 2 | -4/+12 | |
| | |\ \ \ | ||||||
| | | * | | | minor: remove mono compiler warning | Justin Clark-Casey (justincc) | 2012-03-02 | 1 | -2/+1 | |
| | | | | | | ||||||
| | | * | | | Send the right name and creation date on the BasicProfileModule. | Diva Canto | 2012-03-01 | 1 | -2/+11 | |
| | | | | | | ||||||
| | * | | | | ScenePresence line endings and fix AllowMovement default to true. | Dan Lake | 2012-03-02 | 1 | -30/+30 | |
| | |/ / / | ||||||
| | * | | | In ScenePresence, removed several private variables used to store public ↵ | Dan Lake | 2012-03-01 | 1 | -108/+44 | |
| | | | | | | | | | | | | | | | | | parameters. They were only used by the get/set and make code harder to refactor. | |||||
| | * | | | Move SenseRepeaters.Count check inside the SenseRepeatListLock. | Justin Clark-Casey (justincc) | 2012-03-02 | 1 | -4/+4 | |
| | | | | | | | | | | | | | | | | | No methods in the List class are thread safe in the MS specification/documentation | |||||
| | * | | | lock SenseRepeatListLock when added a new sensor during script reconstitution. | Justin Clark-Casey (justincc) | 2012-03-02 | 1 | -1/+3 | |
| | | | | | | | | | | | | | | | | | | | | | This is already being done in the other place where a sensor is added. Adding a sensor whilst another thread is iterating over the sensor list can cause a concurrency exception. | |||||
| | * | | | Adds an OSSL command for regular expression-based string replacement. Parameters | Mic Bowman | 2012-03-01 | 3 | -0/+32 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | are osReplaceString(string source, string patter, string replace, integer count, integer start) The count parameter specifies the total number of replacements to make, -1 makes all replacements. | |||||
| | * | | | Fix indexing on string trim | BlueWall | 2012-03-01 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to zadark for pointing this out, smxy for deciphering the ?: operator and Plugh for the fix \o/ yay for IRC | |||||
| | * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-02-29 | 4 | -21/+25 | |
| | |\ \ \ | ||||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |