Melanie
|
1ebc9d04aa
|
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
|
2012-01-05 08:15:33 +00:00 |
|
Justin Clark-Casey (justincc)
|
3a64522267
|
Minor formatting changes and commented out log lines for future debugging of image manager (udp texture fetch). No significant functional changes.
|
2012-01-04 21:40:15 +00:00 |
|
Melanie
|
a6e305063e
|
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
OpenSim/Services/Interfaces/IUserAccountService.cs
|
2012-01-02 21:41:36 +00:00 |
|
Justin Clark-Casey (justincc)
|
fac8c25851
|
Reduce accessibility of some J2KImage/LLImageManager properties and methods to reduce potential code complexity and make code reading easier.
|
2012-01-02 21:31:42 +00:00 |
|
Melanie
|
bde004c08e
|
Merge branch 'master' into careminster
|
2011-12-28 09:24:35 +00:00 |
|
Diva Canto
|
b6cfe15c7c
|
HG: more / love for Xmas
|
2011-12-24 07:44:26 -08:00 |
|
Melanie
|
4beb0c9b9b
|
Merge branch 'master' into careminster-presence-refactor
|
2011-05-05 09:49:10 +01:00 |
|
Diva Canto
|
d8ee0cbe1c
|
First stab at cleaning up Caps. Compiles. Untested.
|
2011-04-30 09:24:15 -07:00 |