Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Normalized ALL URLs with trailing /'s hopefully. Fixed show hyperlinks ↵ | Diva Canto | 2010-12-09 | 1 | -1/+1 | |
| | | | | command. mantis #5259 | |||||
* | Fixed some inconsistency with trailing /. Made debug messages consistent. ↵ | Diva Canto | 2010-12-05 | 2 | -6/+6 | |
| | | | | Changed the stored region names of HG regions. Increased the size of regionName in DB. | |||||
* | Merge branch 'master-core' into mantis5110 | Jonathan Freedman | 2010-12-05 | 5 | -12/+122 | |
|\ | ||||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2010-11-29 | 1 | -1/+3 | |
| |\ | ||||||
| | * | Refactor appearance and avatar data sending code. Paritioning the routines ↵ | Mic Bowman | 2010-11-27 | 1 | -1/+3 | |
| | | | | | | | | | | | | | | | | | | | | | into "one-to-many" and "many-to-one" makes it possible to call the right function on presence creation (both child and root) and when a child agent is promoted to root. This brings the total number of appearance sends down to one or two on login. Cleaned up the avatar update calls in the groups code. Cleaned up some commented and debugging code, and a few formating fixes. | |||||
| * | | Preservation of creator information now also working in IARs. Cleaned up ↵ | Diva Canto | 2010-11-29 | 1 | -3/+7 | |
| | | | | | | | | | | | | usage help. Moved Osp around, deleted unnecessary OspInventoryWrapperPlugin, added manipulation of SOP's xml representation in a generic ExternalRepresentationUtils function. | |||||
| * | | Creator information preserved upon HG transfers. | Diva Canto | 2010-11-26 | 2 | -8/+87 | |
| | | | ||||||
| * | | WARNING: LOTS OF CONFIGURATION CHANGES AFFECTING PRIMARILY HG CONFIGS. Added ↵ | Diva Canto | 2010-11-25 | 2 | -0/+25 | |
| |/ | | | | | | | capability to preserve creator information on HG asset transfers. Added a new HGAssetService that is intended to be the one outside the firewall. It processes and filters the assets that go out of the grid. Also fixed the normal AssetService to do special things for the main instance (console commands, etc). Moved HGInventoryService to OpenSim.Services.HypergridService. Changed the way the login service gets the ServiceURL configs. | |||||
* | | Merge branch 'master-core' into mantis5110 | Jonathan Freedman | 2010-11-21 | 3 | -7/+331 | |
|\ \ | |/ | ||||||
| * | Added creator info across the board -- TaskInventoryItems and InventoryItems ↵ | Diva Canto | 2010-11-21 | 2 | -24/+38 | |
| | | | | | | | | | | | | themselves. Tested. Seems to be working, main tests pass. Nothing done for IARs or HG transfers yet -- this only works for OARs for the time being. New migration in inventory table in order to make CreatorID varchar(255). | |||||
| * | Global creator information working on MySQL DB and on load/save OARs. ↵ | Diva Canto | 2010-11-21 | 1 | -0/+297 | |
| | | | | | | | | | | | | | | Creator name properly shown on the viewer as first.last @authority. New option added to save oar -profile=url. Migration on RegionStore making CreatorID be 255 chars. Moved Handling of user UUID -> name requests to a new module UserManagement/UserManagementModule. | |||||
| * | minor: add some method comments | Justin Clark-Casey (justincc) | 2010-11-17 | 1 | -2/+7 | |
| | | ||||||
| * | Change the way attachments are persisted. Editing a worn attachment will now | Melanie | 2010-11-16 | 1 | -5/+13 | |
| | | | | | | | | | | | | | | save properly, as will the results of a resizer script working. Attachment positions are no longer saved on each move, but instead are saved once on logout. Attachment script states are saved as part of the attachment now when detaching. | |||||
* | | Merge https://github.com/opensim/opensim into mantis5110 | Jonathan Freedman | 2010-11-21 | 1 | -0/+2 | |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | |||||
| * | Call attachment cleanup when an agent crosses out | Melanie Thielker | 2010-11-08 | 1 | -0/+2 | |
| | | ||||||
* | | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-30 | 1 | -5/+5 | |
|\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | |||||
| * | Change level of some logging messages, turning some info into arguably more ↵ | Justin Clark-Casey (justincc) | 2010-10-30 | 1 | -5/+6 | |
| | | | | | | | | appropriate debug to reduce console spam when log level is info | |||||
| * | Revert "Merge remote branch 'otakup0pe/mantis5110'" | Justin Clark-Casey (justincc) | 2010-10-22 | 2 | -19/+43 | |
| | | | | | | | | | | This reverts commit 21187f459ea2ae590dda4249fa15ebf116d04fe0, reversing changes made to 8f34e46d7449be1c29419a232a8f7f1e5918f03c. | |||||
* | | * throw debug message when no HomeURI is set | Jonathan Freedman | 2010-10-24 | 1 | -0/+2 | |
|/ | ||||||
* | * change the data exchanged within hypergrid transactions | Jonathan Freedman | 2010-10-21 | 2 | -5/+8 | |
| | ||||||
* | * more url / hg cleanup | Jonathan Freedman | 2010-10-11 | 1 | -24/+10 | |
| | ||||||
* | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-10 | 1 | -1/+4 | |
|\ | ||||||
| * | Fix an infinite recursion | Melanie | 2010-10-08 | 1 | -1/+4 | |
| | | ||||||
* | | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-07 | 1 | -5/+26 | |
|\ \ | |/ | ||||||
| * | Plumb the path for multiple object deletes | Melanie | 2010-10-06 | 1 | -5/+26 | |
| | | ||||||
* | | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-05 | 1 | -5/+17 | |
|\ \ | |/ | ||||||
| * | Added viewer's channel, mac, and id0 to agent circuit data. Also moved ↵ | Diva Canto | 2010-10-03 | 1 | -5/+17 | |
| | | | | | | | | client ip address to agent circuit data, so that it's always there. | |||||
* | | * refactor refactor refactor ServerURI 4 lyfe | Jonathan Freedman | 2010-10-02 | 1 | -20/+7 | |
|/ | ||||||
* | Changed SceneObjectGroup to store parts with the fast and thread-safe ↵ | John Hurliman | 2010-09-16 | 1 | -6/+2 | |
| | | | | MapAndArray collection | |||||
* | Formatting cleanup. | Jeff Ames | 2010-09-12 | 4 | -18/+18 | |
| | ||||||
* | Move code that allows llGiveInvetory() to move item into appropriate system ↵ | Justin Clark-Casey (justincc) | 2010-09-04 | 1 | -1/+1 | |
| | | | | | | | folder up from connectors into Scene.Inventory.cs This fixes the problem for all architectures (hg as well as local and grid) and means we don't have to dupe code between connectors. Not ideal in that it becomes non-modular, but methods in Scene.Inventory.cs should eventually be modularized anyway. | |||||
* | minor: remove mono compiler warnings | Justin Clark-Casey (justincc) | 2010-09-03 | 2 | -7/+7 | |
| | ||||||
* | Adjust the "Magic numbers" we use because we can't reference the actual | Melanie Thielker | 2010-08-31 | 1 | -1/+1 | |
| | | | | script state enum to reflect recent changes. | |||||
* | Implements parcel media setting persistence and packet / CAPS handling | Jonathan Freedman | 2010-08-30 | 2 | -118/+20 | |
| | | | | | | properly for the new media settings. Signed-off-by: Melanie <melanie@t-data.com> | |||||
* | Addresses mantis #4991 -- HG between two regions with the same map ↵ | Diva Canto | 2010-08-27 | 1 | -0/+9 | |
| | | | | coordinates fails with no warning | |||||
* | Improve consistency of locking for SOG.m_parts in order to avoid race ↵ | Justin Clark-Casey (justincc) | 2010-08-26 | 1 | -2/+4 | |
| | | | | conditions in linking and unlinking | |||||
* | * Changed a few OSD.FromBinary() calls to the more accurate OSD.FromULong() ↵ | John Hurliman | 2010-08-17 | 1 | -1/+1 | |
| | | | | to fix the build | |||||
* | Attempt at sending TeleportProgress, but it doesn't seem to be doing ↵ | Diva Canto | 2010-08-16 | 1 | -0/+3 | |
| | | | | anything at all. Left it commented, just as a reminder for where those messages could be sent. | |||||
* | Work on TeleportStart: renamed method from TeleportLocationStart to ↵ | Diva Canto | 2010-08-16 | 1 | -6/+4 | |
| | | | | TeleportStart, and now sending this upon all teleports, not just some, and in the right place (EntityTransferModule). | |||||
* | Better comment (related to previous commit) | Diva Canto | 2010-08-15 | 1 | -1/+1 | |
| | ||||||
* | Addresses mantis #4929. Agent was being logged off the grid too soon -- ↵ | Diva Canto | 2010-08-15 | 2 | -6/+23 | |
| | | | | things may still fail. | |||||
* | In EventQueueHelper.uintToByteArray, fetch big end-ian bytes directly from ↵ | Justin Clark-Casey (justincc) | 2010-08-14 | 1 | -6/+4 | |
| | | | | | | | | libomv rather than little endian then swapping This avoids a problem with failing to swap on big-endian machines. This addresses http://opensimulator.org/mantis/view.php?id=4849 Thanks to Valy- for pointing this out and submitting a suggestion patch | |||||
* | minor: remove mono compiler warnings | Justin Clark-Casey (justincc) | 2010-08-13 | 4 | -24/+24 | |
| | ||||||
* | refactor: move binary statistics logging from scene into separate region module | Justin Clark-Casey (justincc) | 2010-08-13 | 1 | -0/+169 | |
| | ||||||
* | refactor: Use SOP.Flags rather than SOP.ObjectFlags | Justin Clark-Casey (justincc) | 2010-08-13 | 1 | -2/+2 | |
| | ||||||
* | Merge branch 'iar-merge' | Justin Clark-Casey (justincc) | 2010-08-04 | 1 | -4/+4 | |
|\ | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs | |||||
| * | Add --merge switch to load iar. | Justin Clark-Casey (justincc) | 2010-06-30 | 1 | -4/+4 | |
| | | | | | | | | | | | | When this switch is used, iar folders are merged with existing same-name user inventory folders. This makes it a little easier to back and restore entire individual user inventories, among other things Added unit test to check behaviour | |||||
* | | Revamp the permissions propagation. This MAY mess up. Please test. | Melanie | 2010-07-13 | 1 | -18/+36 | |
| | | | | | | | | | | | | | | Change the slam bit from 3 to 4. Assume the old slam bit is always set. The new slam bit is a "changed owner" bit, correcting a bug where an item passed from the creator to another with less than full perms, then back (sale test) would arrive back full perm. Lots of in-code docs. | |||||
* | | Add CreateSelected flag onto objects rezzed from inventory | Melanie Thielker | 2010-07-13 | 1 | -0/+1 | |
| | | ||||||
* | | Make taken items go back to the folder they came from | Melanie Thielker | 2010-07-10 | 1 | -0/+14 | |
| | |