 Justin Clark-Casey (justincc)
|
ffd0da23fb
Merge branch 'justincc-master'
|
10 years ago |
|
Justin Clark-Casey (justincc)
|
f49d513089
Change warns associated with UserAgentServiceConnector to debugs, as this is not necessarily a problen with the source simulator (e.g. someone else's remote simulator cannot be contacted).
|
10 years ago |
|
Justin Clark-Casey (justincc)
|
fc35b45e21
If calls to UserAgentServiceConnector fail then throw an exception. This lets the caller decide whether to discard the error or not.
|
10 years ago |
 Melanie
|
c6e9db5866
Merge branch 'master' into careminster
|
10 years ago |
 Oren Hurvitz
|
3018b2c5d7
Materials module: a) Store materials as assets; b) Finalized it (removed the "Demo" label; removed most of the logging); c) Enabled by default
|
10 years ago |
|
Melanie
|
75c68fa29e
Merge branch 'master' into careminster
|
11 years ago |
|
Justin Clark-Casey (justincc)
|
d6d82dbd3c
minor: correct attachment spelling mistake in log message in HGEntityTransferModule.OnIncomingSceneObject()
|
11 years ago |
|
Melanie
|
7830cc9954
Merge branch 'master' into careminster
|
11 years ago |
 Diva Canto
|
b0140383da
Cleanup old hg sessions (older than 2 days)
|
11 years ago |
|
Diva Canto
|
67e500383e
Put guards on a bunch of exception-inducing code, as seen in logs from load test.
|
11 years ago |
|
Melanie
|
f70357eaa3
Merge branch 'master' into careminster
|
11 years ago |
|
Diva Canto
|
ca3ce6da73
HG: avoid call on localhost between sim and UAS for standalone.
|
11 years ago |
|
Diva Canto
|
4778d67005
Finally moved HG agent transfers to use agent fatpacks.
|
11 years ago |
|
Melanie
|
4c83b5e719
Step one of estate settings sharing - port the Avination Estate module (complete module) as changes are too extensive to apply manually
|
11 years ago |
|
Melanie
|
f548a41fb8
Merge branch 'master' into careminster
|
11 years ago |
|
Justin Clark-Casey (justincc)
|
d9c049fd9f
Fix a bug in HGEntityTransferModule to call base.RemoveRegion() when a region is removed rather than base.AddRegion()
|
11 years ago |
|
Melanie
|
206bfe0657
Merge branch 'master' into careminster
|
11 years ago |
|
Diva Canto
|
37fcf87946
Changed a couple of debug messages at the request of osgrid.
|
11 years ago |
|
Melanie
|
29bfd9e46c
Merge branch 'master' into careminster
|
12 years ago |
|
Diva Canto
|
48577af325
More module cleanup: removed the CoreModules.Framework modules directives out of .addin.xml.
|
12 years ago |
|
Melanie
|
d0473b73da
Merge branch 'master' into careminster
|
12 years ago |
|
Diva Canto
|
7412795a0b
HG: flip all configs to HG2.0. PLEASE CHECK YOUR EXISTING HG CONFIGS AGAINST THESE.
|
12 years ago |
|
Melanie
|
6ce93b22d1
Merge branch 'master' into careminster
|
12 years ago |
|
Justin Clark-Casey (justincc)
|
73c9abf5f2
Move OpenSim.Data.RegionFlags -> OpenSim.Framework.RegionFlags to make it easier for other code to use (e.g. LSL_Api) without having to reference OpenSim.Data just for this.
|
12 years ago |
|
Melanie
|
637f5440fe
Merge commit '3c77b8f463a852aecf3cb29fe4e5f4614f474dbf' into careminster
|
12 years ago |
|
Diva Canto
|
3c77b8f463
Use GridUser properly for foreign users.
|
12 years ago |
|
Diva Canto
|
495a3e7daf
Oops, that should be inside the curly bracket.
|
12 years ago |
|
Melanie
|
bbaf2c5a80
Merge branch 'master' into careminster
|
12 years ago |
|
Diva Canto
|
21a6ef5bb6
This fixes HG attachments' missing assets (textures, etc).
|
12 years ago |
|
Melanie
|
1dd75fcdb4
Merge branch 'master' into careminster
|
12 years ago |
