Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | Drop unused Alert() method from ISnmpModule | Melanie | 2010-04-13 | 1 | -2/+1 | |
| | | | | ||||||
* | | | | Merge branch 'careminster' into careminster-presence-refactor | Melanie | 2010-04-13 | 6 | -17/+144 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | lcc | 2010-04-10 | 5 | -13/+86 | |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | resolved Conflicts: OpenSim/Region/Framework/Interfaces/ISnmpModule.cs | |||||
| | * | | | guarantee that a script engine's GetScriptErrors() will not be called | Mike Rieker | 2010-04-10 | 3 | -12/+71 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | until after its OnRezScript() returns so that script compile error messages can be retrieved | |||||
| | * | | | re-fixing this darn file | lcc | 2010-04-10 | 1 | -0/+11 | |
| | | | | | ||||||
| | * | | | Fixing Trap | lcc | 2010-04-10 | 1 | -11/+0 | |
| | | | | | ||||||
| | * | | | Add Scene.SnmpService, which is of type ISnmpModule and, if nun-null, can | Melanie | 2010-04-09 | 1 | -0/+14 | |
| | | | | | | | | | | | | | | | | | | | | be used to send snmp alerts | |||||
| | * | | | Increase the amount of time we wait for a teleport to complete. This allows ↵ | Thomas Grimshaw | 2010-04-07 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | teleportation to a remote region without a local connection to the asset server without timing out. | |||||
| * | | | | Adding ColdStart event | lcc | 2010-04-10 | 1 | -0/+1 | |
| | | | | | ||||||
| * | | | | dding this deleted file... | lcc | 2010-04-10 | 1 | -2/+2 | |
| |/ / / | ||||||
| * | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Melanie Thielker | 2010-04-05 | 1 | -22/+26 | |
| |\ \ \ | ||||||
| | * | | | Fix up my own shoddy code! Fixes prim rez break. Whups! | Thomas Grimshaw | 2010-04-05 | 1 | -22/+26 | |
| | | | | | ||||||
| * | | | | Add the ISnmpModule interface definition to Careminster release | Melanie Thielker | 2010-04-05 | 1 | -0/+11 | |
| |/ / / | ||||||
| * | | | Merge branch 'master' of ssh://TOR/var/git/careminster | Thomas Grimshaw | 2010-04-05 | 4 | -43/+135 | |
| |\ \ \ | ||||||
| | * | | | Fix some overlooked merge conflicts that got committed | Melanie | 2010-04-05 | 1 | -10/+0 | |
| | | | | | ||||||
| * | | | | This commit adds some randomness to object persistence. It's a Work In ↵ | Thomas Grimshaw | 2010-04-05 | 1 | -4/+42 | |
| | | | | | | | | | | | | | | | | | | | | Progress, I am working on improving this to a tiered approach. | |||||
| * | | | | Add a much cheaper agent count retrieval method. This is obsoleted by 0.7 ↵ | Thomas Grimshaw | 2010-04-05 | 1 | -1/+9 | |
| | | | | | | | | | | | | | | | | | | | | so it can be reverted then. | |||||
* | | | | | Merge branch 'careminster' into careminster-presence-refactor | Melanie | 2010-04-05 | 2 | -4/+3 | |
|\ \ \ \ \ | | |/ / / | |/| | | | ||||||
| * | | | | Merge branch '0.6.9-post-fixes' into careminster | Melanie | 2010-04-05 | 4 | -42/+144 | |
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/| | ||||||
| | * | | Fix bug where approximately half the time, attachments would rez only their ↵ | Justin Clark-Casey (justincc) | 2010-03-09 | 4 | -43/+138 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | root prim until right clicked (or otherwise updated). The root cause of this problem was that multiple ObjectUpdates were being sent on attachment which differed enough to confuse the client. Sometimes these would eliminate each other and sometimes not, depending on whether the scheduler looked at the queued updates. The solution here is to only schedule the ObjectUpdate once the attachment code has done all it needs to do. Backport from head. | |||||
| * | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Kitto Flora | 2010-03-19 | 2 | -26/+10 | |
| |\ \ \ | ||||||
| | * | | | Unify a previous refactor of object return with the older solution. We | Melanie | 2010-03-18 | 2 | -26/+10 | |
| | | | | | | | | | | | | | | | | | | | | really don't need two methods doing the same thing, but differently. | |||||
| * | | | | Fix sit with autopilot. | Kitto Flora | 2010-03-19 | 1 | -3/+5 | |
| |/ / / | ||||||
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-04-05 | 1 | -0/+73 | |
|\ \ \ \ | | |_|/ | |/| | | ||||||
| * | | | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-04-01 | 4 | -2/+48 | |
| |\ \ \ | ||||||
| | * | | | Committing the LightShare code, which was developed by TomMeta of Meta7. | Melanie | 2010-03-31 | 4 | -2/+48 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | This allows scripts to set WindLight parameters for clients connecting to a region. Currently, this is only supported by the Meta7 viewer. | |||||
| * | | | | oops, add file missing from last commit | Justin Clark-Casey (justincc) | 2010-04-01 | 1 | -0/+73 | |
| |/ / / | | | | | | | | | | | | | refactor out redundant method from GroupsMessagingModule | |||||
* | | | | Rename Meta7Windlight to LightShare | Melanie | 2010-03-30 | 5 | -14/+13 | |
| | | | | ||||||
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-03-30 | 10 | -228/+324 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | Stab one bug. When joining an estate with a new region, make sure it's also | Melanie | 2010-03-28 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | | | used on first run and not only later. | |||||
| * | | | * Fixed a bug with null value handling in WebUtil.BuildQueryString() | John Hurliman | 2010-03-26 | 1 | -2/+4 | |
| | | | | | | | | | | | | | | | | | | | | * Changed the null check back in estate manager setup but fixed the case for an existing account being found * Implemented SetPassword() in the SimianGrid auth connector | |||||
| * | | | Fixed a backwards null check that was preventing estate owner from being set ↵ | John Hurliman | 2010-03-26 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | and a misleading error message (in grid mode it tries to get a user, not create one) | |||||
| * | | | replace recent IModule.GetGroup() with better GetGroupRecord(string name) | Justin Clark-Casey (justincc) | 2010-03-26 | 1 | -4/+10 | |
| | | | | ||||||
| * | | | minor: some debugging information and spacing changes to group module | Justin Clark-Casey (justincc) | 2010-03-25 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | add get group by name method to IGroupsModule | Justin Clark-Casey (justincc) | 2010-03-25 | 1 | -3/+26 | |
| | | | | ||||||
| * | | | fix unit tests broken by commit dcf18689b9ab29d4ceb2348bb56fc1f77a7a8912 | Justin Clark-Casey (justincc) | 2010-03-25 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | can't prompt for estate owner in unit tests | |||||
| * | | | First stage of the new interactive region creation. This will allow creation | Melanie | 2010-03-23 | 2 | -1/+120 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | of a region and joining it to an existing estate or creating a new estate, as well as creating an estate owner if in standalone, and assigning estate owners. In Grid mode, existing users must be used. MySQL ONLY!!!! so far, as I can't develop or test for either SQLite or MSSQL. | |||||
| * | | | Remove the reading of estate_settings.xml and the associated processing of | Melanie | 2010-03-22 | 2 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | defaults. Adding code to facilitate estate creation / managemment as part of first time start up | |||||
| * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | John Hurliman | 2010-03-19 | 2 | -26/+10 | |
| |\ \ \ | ||||||
| * | | | | Renamed TryGetAvatar to TryGetScenePresence on SceneManager, SceneBase, ↵ | Dan Lake | 2010-03-19 | 7 | -19/+19 | |
| | | | | | | | | | | | | | | | | | | | | Scene and SceneGraph. This was the only change in this patch to keep it isolated from other recent changes to the same set of files. | |||||
| * | | | | Cleaned up access to scenepresences in scenegraph. GetScenePresences and ↵ | Dan Lake | 2010-03-19 | 5 | -203/+147 | |
| | | | | | | | | | | | | | | | | | | | | GetAvatars have been removed to consolidate locking and iteration within SceneGraph. All callers which used these to then iterate over presences have been refactored to instead pass their delegates to Scene.ForEachScenePresence(Action<ScenePresence>). | |||||
* | | | | | Merge branch 'careminster-presence-refactor' of ↵ | Kitto Flora | 2010-03-19 | 10 | -229/+246 | |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | |||||
| * \ \ \ \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-03-18 | 8 | -202/+235 | |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | ||||||
| | * | | | | Unify a previous refactor of object return with the older solution. We | Melanie | 2010-03-18 | 2 | -26/+10 | |
| | |/ / / | | | | | | | | | | | | | | | | really don't need two methods doing the same thing, but differently. | |||||
| | * | | | Inconsistent locking of ScenePresence array in SceneGraph. Fixed by ↵ | Dan Lake | 2010-03-17 | 6 | -165/+211 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eliminating option to return the actual list. Callers can now either request a copy of the array as a new List or ask the SceneGraph to call a delegate function on every ScenePresence. Iteration and locking of the ScenePresences now takes place only within the SceneGraph class. This patch also applies a fix to Combat/CombatModule.cs which had unlocked iteration of the ScenePresences and inconsistent try/catch around the use of those ScenePresences. | |||||
| | * | | | Removed the unused use_async_when_possible config variable | John Hurliman | 2010-03-16 | 1 | -17/+0 | |
| | | | | | ||||||
| | * | | | Fixed several unhandled exceptions and performance issues with ↵ | John Hurliman | 2010-03-16 | 1 | -11/+12 | |
| | | | | | | | | | | | | | | | | | | | | PrimitiveBaseShape.Textures. This really should be moved from a property to a method if it is going to decode a byte[] into a TextureEntry each time | |||||
| | * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | John Hurliman | 2010-03-15 | 5 | -92/+40 | |
| | |\ \ \ | ||||||
| | * | | | | * UuidGatherer now tracks asset types for assets it discovers. The asset ↵ | John Hurliman | 2010-03-15 | 2 | -16/+17 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | types are inferred from context * OAR saving will attempt to correct unknown asset types before writing broken assets to the OAR file | |||||
| * | | | | | Unify a previous refactor of object return with the older solution. We | Melanie | 2010-03-18 | 2 | -26/+10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | really don't need two methods doing the same thing, but differently. |