Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | Change the QUERYACCESS method to eliminate spurious access denied messages | Melanie | 2011-02-16 | 1 | -1/+1 | |
| | | ||||||
| * | Fix up QueryAccess to also check parcels | Melanie | 2011-01-28 | 1 | -1/+1 | |
| | | ||||||
| * | Implement Scope ID lookup on GetLandData. Stacked regions were not handled | Melanie | 2011-01-03 | 1 | -1/+1 | |
| | | | | | | | | properly | |||||
* | | Change the QUERYACCESS method to eliminate spurious access denied messages | Melanie | 2011-02-16 | 1 | -1/+1 | |
| | | ||||||
* | | Fix up QueryAccess to also check parcels | Melanie | 2011-01-28 | 1 | -1/+1 | |
| | | ||||||
* | | Add a careminster API to scripting again | Melanie | 2011-01-24 | 1 | -0/+4 | |
| | | ||||||
* | | Implement Scope ID lookup on GetLandData. Stacked regions were not handled | Melanie | 2010-12-31 | 1 | -1/+1 | |
| | | | | | | | | properly | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-12 | 1 | -1/+1 | |
|\ \ | |/ | ||||||
| * | minor: remove some compiler warnings | Justin Clark-Casey (justincc) | 2010-12-10 | 1 | -1/+1 | |
| | | ||||||
| * | Plumb a code path for the entity transfer module to ask a destination scene | Melanie | 2010-12-09 | 1 | -0/+2 | |
| | | | | | | | | whether or not an agent is allowed there as a root agent. | |||||
* | | Plumb a code path for the entity transfer module to ask a destination scene | Melanie | 2010-12-09 | 1 | -0/+2 | |
| | | | | | | | | whether or not an agent is allowed there as a root agent. | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-06 | 1 | -2/+15 | |
|\ \ | |/ | ||||||
| * | Merge branch 'master-core' into mantis5110 | Jonathan Freedman | 2010-11-21 | 1 | -1/+4 | |
| |\ | ||||||
| * \ | Merge git://github.com/opensim/opensim into mantis5110 | Jonathan Freedman | 2010-11-05 | 1 | -1/+28 | |
| |\ \ | ||||||
| * \ \ | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-30 | 1 | -28/+80 | |
| |\ \ \ | ||||||
| * \ \ \ | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-30 | 1 | -55/+94 | |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | |||||
| * \ \ \ \ | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-29 | 1 | -18/+30 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||||
* | | | | | | | Add the ability for gods to impersonate users. For this, bit 6 needs to be | Melanie | 2010-11-25 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | set in the target's UserFlags and the impersonator must have UserLevel 200 or above. The user can then log in using the target's name and their own password. | |||||
* | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-21 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | ||||||
| * | | | | | | Implement a method to allow regions to query the gridwide Freeswitch | Melanie | 2010-11-21 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | configuration from ROBUST | |||||
| * | | | | | | Start implementing Freeswitch in ROBUST | Melanie | 2010-11-21 | 1 | -1/+3 | |
| | |_|_|_|/ | |/| | | | | ||||||
* | | | | | | Start implementing Freeswitch in ROBUST | Melanie | 2010-11-21 | 1 | -1/+3 | |
| | | | | | | ||||||
* | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-02 | 2 | -58/+176 | |
|\ \ \ \ \ \ | |/ / / / / | ||||||
| * | | | | | Fix HypergridLinker.Check4096() | Marck | 2010-11-01 | 1 | -1/+28 | |
| | |_|_|/ | |/| | | | | | | | | | | | | | Make the optimization with IEnumerable.Except() in Check4096 actually work by providing an appropriate equality definition for GridRegion objects. | |||||
| * | | | | Fixed: ToAvatarAppearance wasn't retrieving the AvatarHeight. | Diva Canto | 2010-10-30 | 1 | -0/+3 | |
| | | | | | ||||||
| * | | | | Fix logins and avatar appearance. Contains a Migration. May contain nuts. | Melanie | 2010-10-30 | 1 | -28/+77 | |
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | This will cause visual params to be persisted along with worn items. With this, alpha and tattoo laters will be saved. Multiple layers MAY work, but not tested because I don't use Viewer 2. | |||||
| * | | | This commit fixes all the appearance related null refs. Still can't log in, | Melanie | 2010-10-30 | 1 | -51/+66 | |
| | | | | | | | | | | | | | | | | client displays a blank error box. | |||||
| * | | | READ CAREFULLY!!! This is a BROKEN commit. It is UNTESTED and INCOMPLETE. | Melanie | 2010-10-30 | 1 | -54/+78 | |
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | It contains a major interface version bump and will NOT work with earlier grid services. This is preliminary work that will lead to layers support. Rest appearance services are commented out completely, they will have to be adapted by someone who actually uses them. Remote admin is working, but has no layers support. There is no layers support in the database. Login likely won't work. You have been warned. | |||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-29 | 1 | -11/+5 | |
|\ \ \ | |/ / | ||||||
| * | | First attempt to get multiple attachments working to support viewer2. | Master ScienceSim | 2010-10-21 | 1 | -11/+5 | |
| | | | | | | | | | | | | | | | | | | | | | The attachment code appears to work correctly for 1.23 viewers so, in spite of some big changes in the internal representation, there don't appear to be regressions. That being said, I still can't get a viewer2 avatar to show correctly. | |||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-29 | 1 | -7/+25 | |
|\ \ \ | ||||||
| * \ \ | Merge branch 'dev-appearance' | Melanie | 2010-10-29 | 1 | -7/+25 | |
| |\ \ \ | ||||||
| | * \ \ | Merge branch 'dev-appearance' of git://github.com/cmickeyb/opensim into ↵ | Melanie | 2010-10-21 | 1 | -7/+25 | |
| | |\ \ \ | | | |/ / | | | | | | | | | | | dev-appearance | |||||
| | | * | | Major refactoring of appearance handling. | Master ScienceSim | 2010-10-20 | 1 | -7/+25 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AvatarService -- add two new methods, GetAppearance and SetAppearance to get around the lossy encoding in AvatarData. Preseve the old functions to avoid changing the behavior for ROBUST services. AvatarAppearance -- major refactor, moved the various encoding methods used by AgentCircuitData, ClientAgentUpdate and ScenePresence into one location. Changed initialization. AvatarAttachments -- added a class specifically to handle attachments in preparation for additional functionality that will be needed for viewer 2. AvatarFactory -- removed a number of unused or methods duplicated in other locations. Moved in all appearance event handling from ScenePresence. Required a change to IClientAPI that propogated throughout all the IClientAPI implementations. | |||||
* | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-23 | 1 | -15/+2 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | Revert "Merge remote branch 'otakup0pe/mantis5110'" | Justin Clark-Casey (justincc) | 2010-10-22 | 1 | -15/+2 | |
| | |_|/ | |/| | | | | | | | | | | | | | | This reverts commit 21187f459ea2ae590dda4249fa15ebf116d04fe0, reversing changes made to 8f34e46d7449be1c29419a232a8f7f1e5918f03c. | |||||
| * | | | * more url / hg cleanup | Jonathan Freedman | 2010-10-11 | 1 | -1/+8 | |
| | | | | ||||||
| * | | | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-05 | 1 | -1/+2 | |
| |\ \ \ | | | |/ | | |/| | ||||||
| * | | | * refactor refactor refactor ServerURI 4 lyfe | Jonathan Freedman | 2010-10-02 | 1 | -1/+7 | |
| | | | | ||||||
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-21 | 1 | -2/+15 | |
|\ \ \ \ | | |_|/ | |/| | | ||||||
| * | | | * more url / hg cleanup | Jonathan Freedman | 2010-10-20 | 1 | -1/+8 | |
| | | | | ||||||
| * | | | * refactor refactor refactor ServerURI 4 lyfe | Jonathan Freedman | 2010-10-20 | 1 | -1/+7 | |
| | |/ | |/| | ||||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-04 | 1 | -1/+2 | |
|\ \ \ | |/ / | ||||||
| * | | Added viewer's channel, mac, and id0 to agent circuit data. Also moved ↵ | Diva Canto | 2010-10-03 | 1 | -1/+2 | |
| |/ | | | | | | | client ip address to agent circuit data, so that it's always there. | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-30 | 1 | -3/+23 | |
|\ \ | |/ | ||||||
| * | Part two of the previous commit, making IGridUserService.LoggedOut() more ↵ | John Hurliman | 2010-09-29 | 1 | -1/+11 | |
| | | | | | | | | flexible without changing current behavior | |||||
| * | Made IGridUserService.SetLastPosition() more flexible to allow different ↵ | John Hurliman | 2010-09-29 | 1 | -2/+12 | |
| | | | | | | | | possible implementations. This doesn't change any behavior or any Robust code, but it simplifies the SimianGrid connector by using the standard OpenSim interface for setting last position now | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-23 | 1 | -2/+5 | |
|\ \ | |/ | ||||||
| * | Fix bug in llGiveInventory() where items were disappearing on relog | Justin Clark-Casey (justincc) | 2010-08-23 | 1 | -2/+5 | |
| | | | | | | | | | | This was a regression - the code to look up the correct type folder was no longer being called if items were added without a parent folder set This may have been broken since commit bd49985a on 2010-05-02 | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-21 | 1 | -2/+4 | |
|\ \ | |/ |