 Melanie
|
45314c6622
Merge branch 'master' into careminster-presence-refactor
|
14 years ago |
 Jonathan Freedman
|
45cd2e3ef9
Merge branch 'master-core' into mantis5110
|
14 years ago |
|
Melanie
|
342dc532ec
Merge branch 'master' into careminster-presence-refactor
|
14 years ago |
|
Melanie
|
ee9aca9c52
Add the ability for gods to impersonate users. For this, bit 6 needs to be
|
14 years ago |
 Diva Canto
|
ae4b02e115
WARNING: LOTS OF CONFIGURATION CHANGES AFFECTING PRIMARILY HG CONFIGS. Added 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.
|
14 years ago |
|
Jonathan Freedman
|
b7f5e82843
Merge branch 'master-core' into mantis5110
|
14 years ago |
|
Melanie
|
3bc9c1adb4
Merge branch 'master' into careminster-presence-refactor
|
14 years ago |
 Marck
|
98f29a47c0
Do not include hyperlinks in a random region search during a login.
|
14 years ago |
 Jonathan Freedman
|
d219317074
Merge branch 'master' into mantis5110
|
14 years ago |
|
Melanie
|
9331898c32
Merge branch 'master' into careminster-presence-refactor
|
14 years ago |
|
Jonathan Freedman
|
5ddb8b535e
* a bit of additional debugging:
|
14 years ago |
 Master ScienceSim
|
b1c8d05888
Major refactoring of appearance handling.
|
14 years ago |
|
Melanie
|
da6816c805
Merge branch 'master' into careminster-presence-refactor
|
14 years ago |
|
Diva Canto
|
0772e19af2
Added viewer's channel, mac, and id0 to agent circuit data. Also moved client ip address to agent circuit data, so that it's always there.
|
14 years ago |
|
Melanie
|
6a1ce17cdb
Merge branch 'master' into careminster-presence-refactor
|
14 years ago |
 Jeff Ames
|
f1f0bc23f4
Formatting cleanup.
|
14 years ago |
|
Melanie
|
e4c2b44e5c
Merge branch 'master' into careminster-presence-refactor
|
14 years ago |
|
Diva Canto
|
8fc68c6d98
Added XFF header processing. Untested, for lack of proxy.
|
14 years ago |
|
Melanie
|
f8ff98577e
Merge branch 'master' into careminster-presence-refactor
|
14 years ago |
|
Diva Canto
|
1955b79759
Partial rewrite of client IP verification. Not completely finished yet, and untested. Committing to move to my other computer.
|
14 years ago |
 meta7
|
144fc20e87
Make fallbacks work, the destination was never actually updated with the fallback details.
|
14 years ago |
|
Melanie Thielker
|
f20dc512e8
Whitespace conflict
|
14 years ago |
|
Melanie
|
1f052520ae
Merge branch 'master' into careminster-presence-refactor
|
14 years ago |
 meta7
|
bef6fa37b9
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
|
14 years ago |
|
meta7
|
32ccc19a62
Make fallbacks work, the destination was never actually updated with the fallback details.
|
14 years ago |
|
Melanie
|
52f49b2a78
Merge branch 'master' into careminster-presence-refactor
|
14 years ago |
|
Melanie
|
bc7ee7ba88
Remove "Could not authorize your session into the region" message in favor
|
14 years ago |
|
Melanie
|
ab5a461c5c
Add search URL to Login Service
|
14 years ago |
|
Melanie
|
4c5788c4c0
Add search URL to Login Service
|
14 years ago |
|
Melanie
|
3302e8ddc4
Merge branch 'master' into careminster-presence-refactor
|
14 years ago |
