Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-17 | 2 | -9/+16 | |
| |\ \ | | |/ | ||||||
| | * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-11-17 | 5 | -12/+61 | |
| | |\ | ||||||
| | * | | Fix gesture and viewer preview sounds not playing | Melanie | 2010-11-17 | 2 | -9/+16 | |
| | | | | ||||||
| * | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-16 | 5 | -12/+61 | |
| |\ \ \ | | | |/ | | |/| | ||||||
| | * | | Add osUnixTimeToTimestamp() | Justin Clark-Casey (justincc) | 2010-11-17 | 3 | -2/+30 | |
| | | | | | | | | | | | | | | | | | | | | This allows an input unix time to be converted to an llGetTimeStamp() format. Thanks Thomax. | |||||
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-11-17 | 12 | -61/+112 | |
| | |\ \ | | | |/ | ||||||
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-11-16 | 5 | -10/+71 | |
| | |\ \ | ||||||
| | * | | | Do not include hyperlinks in a random region search during a login. | Marck | 2010-11-13 | 2 | -10/+31 | |
| | | | | | | | | | | | | | | | | | | | | Before a random region is chosen, available fallback regions are used for the login. | |||||
| * | | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-16 | 1 | -1/+4 | |
| |\ \ \ \ | | | |_|/ | | |/| | | ||||||
| | * | | | Prevent leftover attachments from clogging up the pipes | Melanie | 2010-11-16 | 1 | -1/+4 | |
| | | | | | ||||||
| * | | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-16 | 12 | -61/+109 | |
| |\ \ \ \ | | |/ / / | ||||||
| | * | | | Change the way attachments are persisted. Editing a worn attachment will now | Melanie | 2010-11-16 | 12 | -61/+109 | |
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | 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' of /var/git/opensim/ | opensim mirror account | 2010-11-16 | 1 | -1/+5 | |
| |\ \ \ | | |/ / | ||||||
| | * | | Fix osTeleportAgent for hypergrid destinations. | Marck | 2010-11-16 | 1 | -1/+5 | |
| | | | | | | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com> | |||||
| * | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-16 | 3 | -2/+48 | |
| |\ \ \ | | |/ / | ||||||
| | * | | Add osTeleportOwner. | Marck | 2010-11-16 | 3 | -2/+48 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This provides the same functionality as osTeleportAgent but without the griefing potential. Region owners need not be concerned about the use of this function because it only allows to do what is already possible with the world map. The intended use is with HUDs. For example, a list of (hypergrid) destinations could be made available for quick access. Signed-off-by: Melanie <melanie@t-data.com> | |||||
| * | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-16 | 2 | -7/+18 | |
| |\ \ \ | | |/ / | ||||||
| | * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-11-16 | 3 | -2/+9 | |
| | |\ \ | | | |/ | ||||||
| | * | | Can't detach an object from within the script thread because it will throw. ↵ | Melanie | 2010-11-16 | 1 | -6/+14 | |
| | | | | | | | | | | | | | | | | Use FireAndForget for that. | |||||
| | * | | Diva needs a spanking! Serializing OldItemID breaks script state persistence ↵ | Melanie | 2010-11-16 | 1 | -1/+4 | |
| | | | | | | | | | | | | | | | | in agent inventory. | |||||
* | | | | Merge https://github.com/opensim/opensim into mantis5110 | Jonathan Freedman | 2010-11-21 | 21 | -113/+175 | |
|\ \ \ \ | |/ / / | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | |||||
| * | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-12 | 2 | -0/+6 | |
| |\ \ \ | | | |/ | | |/| | ||||||
| | * | | Fix: Write asset data into Asset.db when using SQLite | Marck | 2010-11-13 | 2 | -0/+6 | |
| | | | | ||||||
| * | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-12 | 1 | -2/+3 | |
| |\ \ \ | | |/ / | ||||||
| | * | | provide avatar name in log if an exception ends up at the top of an async ↵ | Justin Clark-Casey (justincc) | 2010-11-12 | 1 | -2/+3 | |
| | |/ | | | | | | | | | | packet processing stack | |||||
| * | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-12 | 1 | -1/+1 | |
| |\ \ | | |/ | ||||||
| | * | Fix prebubild.exe for Nant add missing "/" fixes Nant builds | BlueWall | 2010-11-12 | 1 | -1/+1 | |
| | | | ||||||
| * | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-11 | 3 | -2/+6 | |
| |\ \ | | |/ | ||||||
| | * | Prebuild fix | BlueWall | 2010-11-12 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | Make prebuild fix for monodevelop. Needed path to reference legacy Mono.Data.SQLite in ./bin/Mono.Data.SQLite.dll. | |||||
| | * | Add PARCEL_DETAILS_ID to LSL | BlueWall | 2010-11-12 | 2 | -0/+4 | |
| | | | ||||||
| * | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-10 | 1 | -0/+7 | |
| |\ \ | | |/ | ||||||
| | * | Prevent teleporting to a region when the egent is banned in all parcels | Melanie | 2010-11-10 | 1 | -0/+7 | |
| | | | ||||||
| * | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-09 | 1 | -1/+0 | |
| |\ \ | | |/ | ||||||
| | * | Remove a debug spam | Melanie | 2010-11-10 | 1 | -1/+0 | |
| | | | ||||||
| * | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-09 | 1 | -1/+3 | |
| |\ \ | | |/ | ||||||
| | * | Although the Allow Voice setting is per estate rather than per region, | Melanie | 2010-11-09 | 1 | -1/+3 | |
| | | | | | | | | | | | | | | | apparently it is required in the region handshake to let the client enable parcel voice controls. So, send it. | |||||
| * | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-09 | 2 | -15/+15 | |
| |\ \ | | |/ | ||||||
| | * | Fix parcel bans to work only on the avatars they're supposed to work on ↵ | Melanie | 2010-11-09 | 2 | -15/+15 | |
| | | | | | | | | | | | | instead of pushing all avatars, even the ones that are allowed. | |||||
| * | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-08 | 10 | -88/+86 | |
| |\ \ | | |/ | ||||||
| | * | Formatting cleanup. | Jeff Ames | 2010-11-08 | 10 | -88/+86 | |
| | | | ||||||
| * | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-07 | 1 | -16/+20 | |
| |\ \ | | |/ | ||||||
| | * | Reinstate a lost fix | Melanie | 2010-11-08 | 1 | -2/+1 | |
| | | | ||||||
| | * | Fix merge artefacts | Melanie | 2010-11-08 | 1 | -14/+19 | |
| | | | ||||||
| * | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-07 | 3 | -4/+46 | |
| |\ \ | | |/ | ||||||
| | * | Prevent plants from being treated like dropped attachments and removed | Melanie | 2010-11-08 | 1 | -2/+1 | |
| | | | | | | | | | | | | from the sim. | |||||
| | * | Call the cleanup after saving attachment states, so that the attachments | Melanie | 2010-11-08 | 1 | -1/+3 | |
| | | | | | | | | | | | | don't get killed before they can be saved | |||||
| | * | Call the Cleanup when an agent logs out, when an agent leaves and just | Melanie | 2010-11-08 | 1 | -0/+3 | |
| | | | | | | | | | | | | | | | before an agent logs in directly. Intentionally not calling this from MakeRoot as that would mess up attachment transfer in teleport | |||||
| | * | Call attachment cleanup when an agent crosses out | Melanie Thielker | 2010-11-08 | 1 | -0/+2 | |
| | | | ||||||
| | * | Add a method to delete left over / dropped attachments | Melanie Thielker | 2010-11-08 | 1 | -0/+32 | |
| | | | ||||||
| | * | Detach attachments displaced by other attachments | Melanie | 2010-11-08 | 1 | -4/+8 | |
| | | |