| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into careminster | Melanie | 2012-01-06 | 0 | -0/+0 |
| |\ | |||||
| | * | If dragging a script that is no copy from prim inventory into agent | Melanie | 2012-01-06 | 1 | -16/+39 |
| | | | | | | | | | | | inventory, stop it first in scene. If deleting from prims, move to trash rather then making it poof. | ||||
| * | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵ | Melanie | 2012-01-06 | 1 | -5/+24 |
| |\ \ | | | | | | | | | | careminster | ||||
| | * | | If dragging a script that is no copy from prim inventory into agent | Melanie | 2012-01-06 | 1 | -5/+24 |
| | | | | | | | | | | | | | | | | inventory, stop it first in scene. If deleting from prims, move to trash rather then making it poof. | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-01-06 | 2 | -1/+5 |
| |\ \ \ | |/ / |/| / | |/ | |||||
| | * | Add ThreatLevel.NoAccess to OSSL. This allows to enable OSSL without enabling | Melanie | 2012-01-06 | 2 | -1/+5 |
| | | | | | | | | | | | any methods, even those without threat, automatically. It is for use with setups wanting to allow only specific methods to specific users. | ||||
| * | | Fix up asset stuff | Melanie | 2012-01-06 | 1 | -0/+3 |
| | | | |||||
| * | | Remove a dangling command registration | Melanie | 2012-01-05 | 1 | -4/+0 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-01-06 | 13 | -183/+571 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs | ||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | BlueWall | 2012-01-05 | 3 | -8/+39 |
| | |\ | |||||
| | | * | Improve "j2k decode" command to tell us how many layers and components were ↵ | Justin Clark-Casey (justincc) | 2012-01-05 | 3 | -8/+39 |
| | | | | | | | | | | | | | decoded, instead of just success/failure | ||||
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | BlueWall | 2012-01-05 | 22 | -267/+730 |
| | |\ \ | | |/ | |||||
| | | * | Add a "j2k decode" region console command that allows a manual request for a ↵ | Justin Clark-Casey (justincc) | 2012-01-05 | 3 | -9/+163 |
| | | | | | | | | | | | | | | | | | | | JPEG2000 decode of an asset For debugging purposes. | ||||
| | | * | Make "show asset" command available simulator side. Actually make the ↵ | Justin Clark-Casey (justincc) | 2012-01-05 | 2 | -5/+56 |
| | | | | | | | | | | | | | | | | | | | service command be "show asset" instead of "show digest" this time. Last time I accidnetally just changed the usage message. | ||||
| | | * | Add size and temporary information to "show asset" command | Justin Clark-Casey (justincc) | 2012-01-05 | 1 | -0/+2 |
| | | | | |||||
| | | * | Rename 'show digest' console command to 'show asset' | Justin Clark-Casey (justincc) | 2012-01-05 | 1 | -1/+1 |
| | | | | |||||
| | | * | Move simulator asset info commands to an optional module from the connector. ↵ | Justin Clark-Casey (justincc) | 2012-01-05 | 3 | -46/+138 |
| | | | | | | | | | | | | | | | | | | | Make them conform with service side commands. This stops them appearing twice when Hypergrid is enabled. | ||||
| | | * | Move asset commands from AssetService to AssetServerConnector so that we can ↵ | Justin Clark-Casey (justincc) | 2012-01-05 | 2 | -122/+129 |
| | | | | | | | | | | | | | | | | | | | harmonise the same commands on the simulator side. No functional change. | ||||
| | | * | recomment log messages I accidentally left uncommented | Justin Clark-Casey (justincc) | 2012-01-05 | 1 | -6/+6 |
| | | | | |||||
| | | * | Improve "app rebake" command to return a better message if no uploaded ↵ | Justin Clark-Casey (justincc) | 2012-01-05 | 4 | -12/+25 |
| | | | | | | | | | | | | | texture ids were available for the rebake request | ||||
| | | * | Commenting out DataSnapShot message "Registering service discovery ↵ | Justin Clark-Casey (justincc) | 2012-01-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | capability" for now. Please uncomment if/when needed. | ||||
| | * | | Merge branch 'new_modules' | BlueWall | 2012-01-05 | 1 | -0/+36 |
| | |\ \ | |||||
| | | * | | Adding empty ISearchModule interface | BlueWall | 2012-01-05 | 1 | -0/+36 |
| | | | | | |||||
| * | | | | That needs to be callable from elsewhere! | Melanie | 2012-01-05 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Melanie | 2012-01-05 | 21 | -80/+482 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-01-05 | 22 | -87/+485 |
| | |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | ||||
| | | * | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2012-01-05 | 13 | -79/+229 |
| | | |\ \ \ | |||||
| | | | * | | | Add "appearance rebake" command to ask a specific viewer to rebake textures ↵ | Justin Clark-Casey (justincc) | 2012-01-04 | 2 | -4/+51 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from the server end. This is not as useful as it sounds, since you can only request rebakes for texture IDs already received. In other words, if the viewer has never sent the server this information (which happens quite often) then it will have no effect. Nonetheless, this is useful for diagnostic/debugging purposes. | ||||
| | | | * | | | Separate out rebake request code from cache validation code AvatarFactoryModule. | Justin Clark-Casey (justincc) | 2012-01-04 | 2 | -31/+63 |
| | | | | | | | | | | | | | | | | | | | | | | | | | This allows some logic simplification and allows an external caller to manually request rebakes even if textures are uploaded (future command). | ||||
| | | | * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-01-04 | 2 | -0/+25 |
| | | | |\ \ \ | |||||
| | | | | * \ \ | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Dan Lake | 2012-01-04 | 1 | -16/+4 |
| | | | | |\ \ \ | |||||
| | | | | * | | | | Added EventManager.OnRegionStarted which is triggered when Heartbeat is started. | Dan Lake | 2012-01-04 | 2 | -0/+25 |
| | | | | | | | | | |||||
| | | | * | | | | | Minor formatting changes and commented out log lines for future debugging of ↵ | Justin Clark-Casey (justincc) | 2012-01-04 | 4 | -22/+80 |
| | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | image manager (udp texture fetch). No significant functional changes. | ||||
| | | | * | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-01-04 | 1 | -4/+4 |
| | | | |\ \ \ \ | | | | |/ / / | |||||
| | | | | * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Dan Lake | 2012-01-03 | 75 | -4683/+4784 |
| | | | | |\ \ \ | |||||
| | | | | * | | | | Access to these static methods to serialize objects are useful outside of ↵ | Dan Lake | 2012-01-03 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | serializer | ||||
| | | | | * | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Dan Lake | 2011-12-20 | 36 | -430/+452 |
| | | | | |\ \ \ \ | |||||
| | | | | * | | | | | Remove unused SetAcceleration and add set on Acceleration parameter | Dan Lake | 2011-12-20 | 11 | -35/+14 |
| | | | | | | | | | | |||||
| | | | * | | | | | | Remove the pointless LLClientView.m_imageManager null check. | Justin Clark-Casey (justincc) | 2012-01-04 | 1 | -16/+4 |
| | | | | |_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | Despite the code comments we never actually null it. | ||||
| | | | * | | | | | Update C5.dll to version 1.1.1 from 1.1.0 | Justin Clark-Casey (justincc) | 2012-01-03 | 1 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | C5 is a collections library and can be found at http://www.itu.dk/research/c5/ This is used in the UDP texture (image) sending code. | ||||
| | | | * | | | | | commented out "Prevented flyoff" log message for now as this becomes ↵ | Justin Clark-Casey (justincc) | 2012-01-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | problematic with bot testing. Please uncomment if still needed. | ||||
| | | | * | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-01-03 | 8 | -5/+253 |
| | | | |\ \ \ \ \ | | | | | |_|/ / | | | | |/| | | | |||||
| | | | * | | | | | minor: add missing newlines to pCampbot usage statement | Justin Clark-Casey (justincc) | 2012-01-03 | 1 | -4/+4 |
| | | | | | | | | | |||||
| | | * | | | | | | Small fix to GetWorldPosition to get closer to Avination sit behavior | Melanie | 2012-01-05 | 1 | -10/+4 |
| | | | |/ / / / | | |/| | | | | |||||
| | | * | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | BlueWall | 2012-01-03 | 7 | -84/+109 |
| | | |\ \ \ \ \ | | | |/ / / / | |||||
| | | * | | | | | Merge branch 'new_modules' | BlueWall | 2012-01-03 | 8 | -5/+253 |
| | | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | |||||
| | | | * | | | | Profile Updates | BlueWall | 2012-01-03 | 8 | -5/+253 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update basic profile to use the replaceable interface, making configuration less error-prone. Add support to query avatar's home user account and profile service for regions usng the updated OpenProfileModule with Hypergrid. | ||||
| * | | | | | | | Clean up GetWorldPosition | Melanie | 2012-01-05 | 1 | -7/+3 |
| | | | | | | | | |||||
| * | | | | | | | Prevent spurious "CHANGED_POSITION" during region backup | Melanie | 2012-01-05 | 1 | -3/+4 |
| |/ / / / / / | |||||
| * | | | | | | Merge branch 'master' into careminster | Melanie | 2012-01-02 | 29 | -652/+267 |
| |\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
 |
index : opensim-SC_OLD | |
| My fork of OpenSim for IG and MG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |