| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | | | | | 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. | |||||
| | * | | | | | | Add a cache on GridService requests | Melanie | 2012-02-24 | 1 | -0/+10 | |
| | |/ / / / / | ||||||
| | * | | | | | 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 | 4 | -4/+44 | |
| |\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs | |||||
| | * | | | | | | Merge branch 'master' of /home/opensim/var/repo/opensim into v3_support | BlueWall | 2012-03-04 | 2 | -8/+3 | |
| | |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | ||||||
| | | * | | | | | comment out "[CAPS]: ScriptTaskInventory Request" log spam | Justin Clark-Casey (justincc) | 2012-03-02 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| | * | | | | | | OpenID auth needs hashing before authenticating | BlueWall | 2012-03-02 | 2 | -2/+2 | |
| | | | | | | | | ||||||
| | * | | | | | | Merge branch 'master' into v3_support | BlueWall | 2012-03-02 | 22 | -317/+256 | |
| | |\ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ | Merge branch 'master' of /home/opensim/src/opensim into v3_support | BlueWall | 2012-02-29 | 1 | -2/+2 | |
| | |\ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into v3_support | BlueWall | 2012-02-25 | 21 | -103/+276 | |
| | |\ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ | Merge branch 'master' into v3_support | BlueWall | 2012-02-22 | 11 | -48/+32 | |
| | |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | V3 Support | BlueWall | 2012-02-22 | 2 | -2/+22 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The V3 webapps need SSO capability and use OpenID. We need to send both our OpenID server url and a token for the user in the login response. | |||||
| | * | | | | | | | | | | V3 Support: | BlueWall | 2012-02-21 | 2 | -2/+22 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This starts V3 support by adding a profile server url to the login response. This requires viewer support - which is also being worked on. | |||||
| * | | | | | | | | | | | Merge branch 'master' into careminster | Melanie | 2012-03-03 | 22 | -321/+255 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | |||||
| | * | | | | | | | minor: Rename pCampbot console prompt to "pCampbot" rather than "Region" | Justin Clark-Casey (justincc) | 2012-03-02 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
| | * | | | | | | | Provide feedback on bot login states in pCampbot | Justin Clark-Casey (justincc) | 2012-03-02 | 1 | -0/+7 | |
| | | | | | | | | | ||||||
| | * | | | | | | | 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. | |||||
| | * | | | | | | | Merge branch 'master' of /home/opensim/src/opensim | BlueWall | 2012-03-01 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | 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 | |||||
| | * | | | | | | | | Use a fully stubbed out MockConsole for unit tests rather than inheriting ↵ | Justin Clark-Casey (justincc) | 2012-03-01 | 2 | -23/+38 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from CommandConsole. This is so that the static MainConsole.Instance doesn't retain references to methods registered by scene and other modules to service commands. This prevents the scene from being garbage collected at the end of a test. This is not the final thing preventing GC - next up is the timer started by SimStatsReporter that holds a reference to Scene that prevents end of test gc. | |||||
| | * | | | | | | | | Flick master up to 0.7.4 | Justin Clark-Casey (justincc) | 2012-02-29 | 1 | -1/+1 | |
| | |/ / / / / / / | ||||||
| | * | | | | | | | Revert "Fix authentication for OpenID provider" | BlueWall | 2012-02-29 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 9f597c2d423a80279c4aed042be8a991eedefa21. Fixing OpenID causes issues with other parts of the code. | |||||
| | * | | | | | | | Merge branch 'master' of /home/opensim/src/opensim | BlueWall | 2012-02-29 | 1 | -2/+2 | |
| | |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | ||||||
| | | * | | | | | | Fix authentication for OpenID provider | BlueWall | 2012-02-29 | 1 | -2/+2 | |
| | | | |/ / / / | | |/| | | | | ||||||
| | * | | | | | | Don't start pCampbot if the user doesn't supply bot firstname, lastname stub ↵ | Justin Clark-Casey (justincc) | 2012-02-29 | 1 | -0/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and password | |||||
| | * | | | | | | Use correct casing of RegionSettings.Sandbox in the various database modules. | Justin Clark-Casey (justincc) | 2012-02-29 | 3 | -4/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MySQL and MSSQL have it as Sandbox, sqlite as sandbox. In various different places in every plugin the wrong casing is used... Consistency, who needs it? Or one day sqlite can change to Sandbox. | |||||
| | * | | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-02-29 | 5 | -92/+32 | |
| | |\ \ \ \ \ \ | ||||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |