Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster | Melanie | 2012-01-21 | 22 | -46/+762 |
|\ | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | BlueWall | 2012-01-20 | 11 | -33/+149 |
| |\ | |||||
| | * | Revert "Change linux, windows and mac ODE libraries to use the GIMPACT ↵ | Justin Clark-Casey (justincc) | 2012-01-20 | 7 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | collider rather than OPCODE." This reverts commit 4eef6725f4116aa70de729b71d60636a7d0a68f5. Reverting for now since this fails with "terminate called after throwing an instance of 'std::bad_alloc'" on Wright Plaza instances. | ||||
| | * | Allow a viewer UDP image request retry to trigger another asset fetch if an ↵ | Justin Clark-Casey (justincc) | 2012-01-19 | 2 | -6/+32 |
| | | | | | | | | | | | | | | | | | | existing fetch hasn't responded before a timeout. This is to stop a high priority image/texture request from blocking the entire download queue if its asset fetch got dropped for some reason. | ||||
| | * | Add image not in database test for LLImageManager | Justin Clark-Casey (justincc) | 2012-01-19 | 4 | -13/+58 |
| | | | |||||
| | * | refactor: separate out common parts of LLImageManagerTests | Justin Clark-Casey (justincc) | 2012-01-19 | 1 | -48/+40 |
| | | | |||||
| | * | Add LLImageManager regression test for discard case | Justin Clark-Casey (justincc) | 2012-01-19 | 1 | -0/+53 |
| | | | |||||
| * | | Telehub Support: | BlueWall | 2012-01-20 | 7 | -4/+251 |
| |/ | | | | | | | Support for viewer side of telehub management. Can manupulate Telehubs and SpawnPoints from the viewer estate managemnt tools. This is a work in progress and does not yet persist or affect teleport routing. | ||||
| * | Add "image queues clear <first-name> <last-name>" console command | Justin Clark-Casey (justincc) | 2012-01-19 | 2 | -15/+80 |
| | | | | | | | | This allows a way to manually clear pending image queue requests for debug purposes | ||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-01-19 | 4 | -1/+64 |
| |\ | |||||
| | * | Add osGetGridHomeURI function | BlueWall | 2012-01-19 | 3 | -0/+28 |
| | | | | | | | | | | | | Add osGetHomeURI function to the family of osGetGrid* functions. Returns the SRV_HomeURI setting from the [LoginService] configuration. | ||||
| | * | Change URI to lowercase to match existing | BlueWall | 2012-01-19 | 1 | -1/+1 |
| | | | |||||
| | * | Add fetching of SRV_HomeURI to "/json_grid_info" | BlueWall | 2012-01-19 | 1 | -1/+36 |
| | | | | | | | | | | | | Make SRV_HomeURI available on the GridInfoService through the "/json_grid_info" URI. This i s mainly to service OSSL, but can be seen externally via the URI. | ||||
| * | | Add basic request and send image regression tests for LLImageManager | Justin Clark-Casey (justincc) | 2012-01-19 | 7 | -12/+109 |
| |/ | |||||
| * | RegionReady: | BlueWall | 2012-01-18 | 2 | -1/+7 |
| | | | | | | | | Back out some of the oar monitoring for the time being. Need to find a better way to get feedback. Will re-visit this soon. | ||||
| * | Merge branch 'master' of /home/opensim/src/opensim | BlueWall | 2012-01-17 | 3 | -1/+34 |
| |\ | |||||
| | * | Add function osGetGridCustom | BlueWall | 2012-01-17 | 3 | -1/+34 |
| | | | | | | | | | | | | Add function osGetGridCustom to take an argument for the GridInfo kpv to retrieve from the GridInfoService | ||||
| * | | Merge branch 'master' of /home/opensim/src/opensim | BlueWall | 2012-01-17 | 4 | -3/+92 |
| |\ \ | | |/ | |||||
| | * | Update osGetGrid**** functions | BlueWall | 2012-01-17 | 2 | -3/+75 |
| | | | | | | | | | | | | The osGetGrid**** functions will now get the grid settings from the GridInfoService. Set the GridInfoURI in your ./bin/config-include/GridCommon.ini [GridInfo] section. | ||||
| | * | Merge branch 'master' of /home/opensim/lib/osgrid/opensim | BlueWall | 2012-01-17 | 2 | -0/+17 |
| | |\ | |||||
| | | * | Add json handler for GridInfo | BlueWall | 2012-01-17 | 2 | -0/+17 |
| | | | | |||||
| * | | | Change linux, windows and mac ODE libraries to use the GIMPACT collider ↵ | Justin Clark-Casey (justincc) | 2012-01-17 | 7 | -0/+0 |
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rather than OPCODE. As discussed on the opensim-dev mailing list, this is to avoid a demonstrated ODE collider segfault when stress-testing a simulator running more than one region using the bundled pCampbot.exe As before, the ODE revision used is r1755 - only the collider has changed. Tests so far reveal little performance change. However, if noticeable issues do arise, please report on mantis and/or the opensim-dev mailing list. The previous libraries are temporarily in bin/Physics-previous-ode-libs These can be copied back to bin if one wants to compare behaviour with the previous libraries. | ||||
* | | | Add some logging | Melanie | 2012-01-17 | 1 | -0/+41 |
| | | | |||||
* | | | Fix prim calculations so that > 32767 prims are supported | Melanie | 2012-01-17 | 2 | -3/+5 |
| | | | |||||
* | | | Spin off NPC deletion into a thread to avoid it being done on a script | Melanie | 2012-01-17 | 1 | -1/+3 |
| | | | | | | | | | | | | microthread. A stab at fixing exceptions. | ||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-01-16 | 0 | -0/+0 |
|\ \ \ | |/ / | |||||
| * | | Allow retrival of multiple user records in one operation, analog to presence | Melanie | 2012-01-16 | 7 | -2/+128 |
| | | | |||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-01-16 | 5 | -194/+24 |
|\ \ \ | |/ / | |||||
| * | | Comment out noisy log lines I accidentally included in the nant build target ↵ | Justin Clark-Casey (justincc) | 2012-01-16 | 3 | -8/+8 |
| | | | | | | | | | | | | | | | | | | adjustment commit. Left in the method doc. | ||||
| * | | Remove monocov and other obsolete nant build targets. | Justin Clark-Casey (justincc) | 2012-01-16 | 5 | -193/+20 |
| |/ | | | | | | | | | monocov was a code coverage attempt 3 years ago which no longer works. other removed targets have been commented out or unused for a very long time | ||||
| * | protect the region ready alerts for loading oarfiles if no post URI is set | Mic Bowman | 2012-01-14 | 1 | -2/+5 |
| | | |||||
* | | Add methods to allow the groups modules to query online status and last login | Melanie | 2012-01-16 | 7 | -2/+128 |
| | | |||||
* | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Melanie | 2012-01-15 | 1 | -14/+24 |
|\ \ | |||||
| * \ | Merge branch 'master' into careminster | Melanie | 2012-01-15 | 1 | -14/+24 |
| |\ \ | | |/ | |||||
| | * | commented out redundant land owner checks for osTeleportAgent there is | nebadon | 2012-01-14 | 1 | -14/+24 |
| | | | | | | | | | | | | | | | | | | no need for these checks just use Allow_osTeleportAgent = PARCEL_OWNER also increased function to severe threat level to make it harder to accidently enable it for everyone. | ||||
* | | | Disable using an agent ID to clone NPCs. The griefing potential is too great | Melanie | 2012-01-15 | 1 | -7/+7 |
|/ / | |||||
* | | Fix merge | Melanie | 2012-01-14 | 2 | -61/+1 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-01-14 | 10 | -117/+269 |
|\ \ | |/ | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| * | Allow SmtpClients and other SSL users to work with our cert handler installed | Melanie | 2012-01-14 | 1 | -9/+25 |
| | | |||||
| * | Extend scripts show command to accept a single item UUID parameter to ↵ | Justin Clark-Casey (justincc) | 2012-01-14 | 1 | -40/+47 |
| | | | | | | | | | | | | display one script's status Usage is now scripts show [<script-item-uuid>] | ||||
| * | Register the UrlModule for script engine events OnScriptRemoved and ↵ | Justin Clark-Casey (justincc) | 2012-01-14 | 4 | -13/+21 |
| | | | | | | | | | | | | | | | | | | OnObjectRemoved just once in the UrlModule itself, rather than repeatedly for every script. Doing this in every script is unnecessary since the event trigger is parameterized by the item id. All that would happen is 2000 scripts would trigger 1999 unnecessary calls, and a large number of initialized scripts may eventually trigger a StackOverflowException. Registration moved to UrlModule so that the handler is registered for all script engine implementations. This required moving the OnScriptRemoved and OnObjectRemoved events (only used by UrlModule in core) from IScriptEngine to IScriptModule to avoid circular references. | ||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Mic Bowman | 2012-01-13 | 1 | -24/+40 |
| |\ | |||||
| | * | Merge branch 'master' of /home/opensim/src/opensim | BlueWall | 2012-01-13 | 1 | -24/+40 |
| | |\ | |||||
| | | * | Fix improper code formatting introduced in 6214e6a217cf | Bo Iwu | 2012-01-13 | 1 | -24/+40 |
| | | | | | | | | | | | | | | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com> | ||||
| * | | | Cleaned up the LookAt code in SOP and SOG. Added support for incrementally | Mic Bowman | 2012-01-13 | 3 | -49/+34 |
| |/ / | | | | | | | | | | | | | rotating physical objects. This does not use physics. Currently the rate of change is determined as 1 / (PI * Strength). | ||||
| * | | Fix llRotLookAt and llLookAt for non-physical objects. Per conversation | Mic Bowman | 2012-01-13 | 1 | -7/+23 |
| |/ | | | | | | | | | with Melanie and Nebadon, SL behavior seems to be that non physical objects snap to the request rotation. | ||||
| * | Update RegionReadyModule | BlueWall | 2012-01-13 | 3 | -7/+98 |
| | | | | | | | | Fix triggering of alerts when rezzing first script to an empty region, add login disable when loading oars. | ||||
* | | Allow SmtpClients and other SSL users to work with our cert handler installed | Melanie | 2012-01-14 | 1 | -9/+25 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-01-13 | 2 | -96/+0 |
|\ \ | |/ | |||||
| * | Undo some prior work | BlueWall | 2012-01-12 | 2 | -96/+0 |
| | | | | | | | | Move some added fuctions out of core into the addon module to keep things clean |