aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * Merge branch 'master-core' into mantis5110Jonathan Freedman2010-12-052-2/+9
| |\
| * \ Merge branch 'master-core' into mantis5110Jonathan Freedman2010-11-231-2/+4
| |\ \
| * \ \ Merge branch 'master-core' into mantis5110Jonathan Freedman2010-11-214-74/+72
| |\ \ \
* | \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2010-12-032-2/+9
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | Also prevent god takes from ending up in Lost and Found
| * | | | WARNING: LOTS OF CONFIGURATION CHANGES AFFECTING PRIMARILY HG CONFIGS. Added ↵Diva Canto2010-11-252-2/+9
| | |_|/ | |/| | | | | | | | | | 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.
| * | | Fix more potential nullrefsMelanie2010-11-231-2/+4
| | |/ | |/|
* | | Fix more potential nullrefsMelanie2010-11-231-2/+4
| | |
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-221-0/+2
|\ \ \ | |/ /
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2010-11-212-73/+64
| |\ \
| * | | Added creator info across the board -- TaskInventoryItems and InventoryItems ↵Diva Canto2010-11-211-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | 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).
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-211-0/+19
|\ \ \ \ | | |/ / | |/| |
| * | | Implement a method to allow regions to query the gridwide FreeswitchMelanie2010-11-211-0/+19
| | | | | | | | | | | | | | | | configuration from ROBUST
| * | | Start implementing Freeswitch in ROBUSTMelanie2010-11-212-73/+45
| |/ /
| * | Change the way attachments are persisted. Editing a worn attachment will nowMelanie2010-11-161-1/+6
| | | | | | | | | | | | | | | | | | | | | 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.
* | | Start implementing Freeswitch in ROBUSTMelanie2010-11-212-73/+45
| | |
* | | Change the way attachments are persisted. Editing a worn attachment will nowMelanie2010-11-161-1/+6
| | | | | | | | | | | | | | | | | | | | | 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 branch 'master' into careminster-presence-refactorMelanie2010-10-231-2/+0
|\ \ \ | |/ /
| * | Revert "Merge remote branch 'otakup0pe/mantis5110'"Justin Clark-Casey (justincc)2010-10-221-9/+1
| |/ | | | | | | | | This reverts commit 21187f459ea2ae590dda4249fa15ebf116d04fe0, reversing changes made to 8f34e46d7449be1c29419a232a8f7f1e5918f03c.
| * * change the data exchanged within hypergrid transactionsJonathan Freedman2010-10-211-2/+8
| |
| * * more url / hg cleanupJonathan Freedman2010-10-111-0/+2
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-211-0/+2
|\ \
| * | * more url / hg cleanupJonathan Freedman2010-10-201-0/+2
| |/
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-061-1/+1
|\ \ | |/
| * Formatting cleanup.Jeff Ames2010-10-041-1/+1
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-046-10/+68
|\ \ | |/
| * Made the home agent handler check for xff if behind a proxy.Diva Canto2010-10-032-3/+23
| |
| * Made the Gatekeeper proxy-able.Diva Canto2010-10-033-3/+28
| |
| * Added viewer's channel, mac, and id0 to agent circuit data. Also moved ↵Diva Canto2010-10-032-4/+17
| | | | | | | | client ip address to agent circuit data, so that it's always there.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-021-6/+20
|\ \ | |/
| * adding -logconfig to Robust.exeBlueWall2010-10-011-6/+20
| | | | | | | | | | | | Adding -logconfig to Robust.exe. will still process the -logfile option, as before. No options given, the value "Robust.log" will be written in the ./bin directory
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-301-2/+2
|\ \ | |/
| * Part two of the previous commit, making IGridUserService.LoggedOut() more ↵John Hurliman2010-09-291-1/+1
| | | | | | | | flexible without changing current behavior
| * Made IGridUserService.SetLastPosition() more flexible to allow different ↵John Hurliman2010-09-291-1/+1
| | | | | | | | 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-refactorMelanie2010-09-132-1/+80
|\ \ | |/ | | | | | | The modules will need to be updated for this to compile and run again. Please don't use until I do the companion commit to modules later on.
| * Formatting cleanup.Jeff Ames2010-09-121-1/+1
| |
| * Renamed the Helo server connector to a consistent name. Added this in ↵Diva Canto2010-09-081-2/+3
| | | | | | | | connector to both Robust.HG.ini.example and HypergridServiceInConnectorModule.
| * No need for a config var for the HELO message on the server-side. It's robust.Diva Canto2010-09-081-8/+1
| |
| * First version of the Hypergrid HELO service that will enable different ↵Diva Canto2010-09-081-0/+85
| | | | | | | | backends to interoperate.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-055-23/+43
|\ \ | |/
| * Make User Agent Service and Login Service separable.Diva Canto2010-09-043-21/+28
| |
| * Added XFF header processing. Untested, for lack of proxy.Diva Canto2010-09-032-2/+15
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-211-0/+20
|\ \ | |/
| * Partial rewrite of client IP verification. Not completely finished yet, and ↵Diva Canto2010-08-191-0/+20
| | | | | | | | untested. Committing to move to my other computer.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-181-4/+3
|\ \ | |/
| * minor: change some logging levelsJustin Clark-Casey (justincc)2010-08-111-3/+2
| |
| * minor: change "no [GridInfo] config" warning to refer to "configuration ↵Justin Clark-Casey (justincc)2010-08-111-1/+1
| | | | | | | | files" rather than "OpenSim.ini"
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-071-0/+33
|\ \ | |/
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-08-071-0/+33
| |\
| | * Allow creation of link regions if there is an existing region within a 4096 ↵Marck2010-08-061-0/+33
| | | | | | | | | | | | | | | | | | range. Also add GetHyperlinks() to the grid service.
| * | Correct display of landmark about info. Also correct region maturity ratingMelanie Thielker2010-08-071-1/+3
| |/ | | | | | | | | in LM info. Maturity is NOT the parcel's setting, that is only for the image and text. Parcel maturity is governed by region maturity.
generated by cgit v1.1 at 2024-12-22 20:53:06 +0000