Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'careminster' into careminster-presence-refactor | Melanie | 2010-05-21 | 2 | -22/+54 |
|\ | |||||
| * | Merge branch '0.6.9-post-fixes' into careminster | Melanie | 2010-05-21 | 1 | -0/+73 |
| |\ | |||||
| | * | back port groups changes | unknown | 2010-05-05 | 1 | -0/+73 |
| | | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com> | ||||
| | * | Fix linking issue introduced in my earlier commit | Melanie Thielker | 2010-04-30 | 1 | -1/+19 |
| | | | |||||
| * | | Change the way the object perms are propagated to attempt to salvage | Melanie | 2010-05-21 | 1 | -21/+23 |
| | | | | | | | | | | | | some older content | ||||
| * | | Fix a nullref issue in SitAltitudeCallback | Tom Grimshaw | 2010-05-19 | 1 | -50/+53 |
| | | | |||||
* | | | Initialise m_initialSitTarget to ZERO_VACTOR for safety's sake as per convo ↵ | Tom Grimshaw | 2010-05-19 | 1 | -1/+1 |
| | | | | | | | | | | | | with kitto | ||||
* | | | Fix a nullref issue in SitAltitudeCallback | Tom Grimshaw | 2010-05-19 | 1 | -6/+9 |
| | | | |||||
* | | | Don't send kill packets to child agents as we close them | Tom Grimshaw | 2010-05-18 | 1 | -2/+2 |
| | | | |||||
* | | | Fix to the scenario where we send an agent to a neighbouring sim (via ↵ | Tom Grimshaw | 2010-05-18 | 3 | -6/+27 |
| | | | | | | | | | | | | teleport), then tell our neighbours to close the agents.. thereby disconnecting the user. Added a new CloseChildAgent method in lieu of CloseAgent. This has been a long standing problem - with any luck this will cure it. | ||||
* | | | Fix for hanging on "Connecting to region".. caused by packets being ↵ | Tom Grimshaw | 2010-05-18 | 1 | -49/+53 |
| | | | | | | | | | | | | processed before the presence has bound to receive events. Fixed this by adding packets to a queue and then processing them when the presence is ready. | ||||
* | | | When killing a zombie session, don't send the stop packet since it often has ↵ | Tom Grimshaw | 2010-05-17 | 1 | -1/+1 |
| | | | | | | | | | | | | the effect of killing a newly connected client. | ||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-05-16 | 1 | -23/+14 |
|\ \ \ | |||||
| * | | | Fixes mantis #4622. | Diva Canto | 2010-05-16 | 1 | -23/+14 |
| | | | | |||||
* | | | | Merge branch 'careminster-presence-refactor' of ↵ | Melanie | 2010-05-16 | 3 | -11/+61 |
|\ \ \ \ | | | | | | | | | | | | | | | | ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| * | | | | Kill some locks that have crept into SOG | Tom Grimshaw | 2010-05-12 | 1 | -2/+12 |
| | | | | | |||||
| * | | | | Optimise the heavily used GetScenePresences; eliminate the array->list ↵ | Tom Grimshaw | 2010-05-12 | 1 | -8/+48 |
| | | | | | | | | | | | | | | | | | | | | conversion on every call and transition from hard locks to ReaderWriter locks. | ||||
| * | | | | Fix another ReaderWriterLockSlim issue | Tom Grimshaw | 2010-05-10 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-05-16 | 3 | -24/+77 |
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | |||||
| * | | | Finalized the client's TCP IP address verification process for HG1.5. | Diva Canto | 2010-05-15 | 3 | -24/+77 |
| | | | | |||||
* | | | | Fix overlooked readLock which was left open | Tom Grimshaw | 2010-05-10 | 1 | -1/+2 |
| | | | | |||||
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-05-10 | 2 | -3/+5 |
|\ \ \ \ | |/ / / | |||||
| * | | | * Fixed spamming the assets table with map tiles. The tile image ID is now ↵ | Diva Canto | 2010-05-09 | 2 | -3/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | stored in regionsettings. Upon generation of a new tile image, the old one is deleted. Tested for SQLite and MySql standalone. * Fixed small bug with map search where the local sim regions weren't found. | ||||
* | | | | Merge branch 'careminster' into careminster-presence-refactor | Melanie | 2010-05-08 | 3 | -19/+19 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Kitto Flora | 2010-05-07 | 4 | -36/+84 |
| |\ \ \ | |||||
| * | | | | Fix Mouse+WASD makes Av rise; Fix PREJUMP. | Kitto Flora | 2010-05-07 | 3 | -19/+19 |
| | | | | | |||||
* | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-05-08 | 1 | -5/+16 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | GridUserService in place. Replaces the contrived concept of storing user's ↵ | Diva Canto | 2010-05-07 | 1 | -5/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | home and position info in the presence service. WARNING: I violated a taboo by deleting 2 migration files and simplifying the original table creation for Presence. This should not cause any problems to anyone, though. Things will work with the new simplified table, as well as with the previous contrived one. If there are any problems, solving them is as easy as dropping the presence table and deleting its row in the migrations table. The presence info only exists during a user's session anyway. BTW, the Meshing files want to be committed too -- EOFs. | ||||
* | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-05-06 | 2 | -3/+18 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | * Fixes Library bugs in grid mode. Partly a missing check and partly a ↵ | Diva Canto | 2010-05-05 | 2 | -3/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | missing configuration. * Made previous Robust config changes consistent in Robust.HG.ini.example | ||||
| * | | | | Remove the m_Viewer variable and make the property a shortcut to the | Melanie Thielker | 2010-05-05 | 2 | -7/+1 |
| | | | | | | | | | | | | | | | | | | | | proper field in AgentCircuitData instead | ||||
* | | | | | Remove the m_Viewer variable and make the property a shortcut to the | Melanie Thielker | 2010-05-06 | 2 | -7/+1 |
| | | | | | | | | | | | | | | | | | | | | proper field in AgentCircuitData instead | ||||
* | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-05-05 | 1 | -1/+3 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Stab a test fail | Melanie | 2010-05-05 | 1 | -1/+3 |
| | | | | | |||||
| * | | | | Plumb Viewer version into ScenePresence for initial login. It's still not | Melanie Thielker | 2010-05-05 | 2 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | carried along | ||||
| * | | | | Plumb the viewer version string through into AgentCircuitData. Now all that | Melanie Thielker | 2010-05-05 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is left os to figure out what black magic turns AgentCircuitData into AgentData and then copy that into the ScenePresence, where m_Viewer is already added with this commit and waits for the data. | ||||
| * | | | | Strip estate message sending out from the estate management module and | Melanie Thielker | 2010-05-04 | 2 | -13/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the dialog module. Convert it to an event on the estate module interface. The old implementation did the same as message to region, a button that is right next to it on the UI. This implementation prevented people from adding a more sane one in a module. | ||||
| * | | | | make the events more useful by providing the source region | Melanie Thielker | 2010-05-04 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Add events to the estate interface to let interested modules know of | Melanie Thielker | 2010-05-04 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | changes to estate settings | ||||
| * | | | | Add "reload estate" command to sims | Melanie Thielker | 2010-05-04 | 1 | -0/+14 |
| | | | | | |||||
| * | | | | Allow reloading of estate settings into a running region. Move sun update | Melanie Thielker | 2010-05-04 | 1 | -0/+46 |
| | | | | | | | | | | | | | | | | | | | | | | | | | helper into Scene, since that is less evil than exposing m_storageManager to the public. | ||||
| * | | | | Store given items in correct parent folder. Fixes items given to offline avatars | Melanie Thielker | 2010-05-03 | 1 | -0/+19 |
| | | | | | | | | | | | | | | | | | | | | not getting lost. | ||||
| * | | | | Fix a bug in owner change notification | Melanie | 2010-05-03 | 1 | -1/+3 |
| | | | | | |||||
* | | | | | Plumb Viewer version into ScenePresence for initial login. It's still not | Melanie Thielker | 2010-05-06 | 2 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | carried along | ||||
* | | | | | Plumb the viewer version string through into AgentCircuitData. Now all that | Melanie Thielker | 2010-05-06 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is left os to figure out what black magic turns AgentCircuitData into AgentData and then copy that into the ScenePresence, where m_Viewer is already added with this commit and waits for the data. | ||||
* | | | | | Strip estate message sending out from the estate management module and | Melanie Thielker | 2010-05-04 | 2 | -13/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the dialog module. Convert it to an event on the estate module interface. The old implementation did the same as message to region, a button that is right next to it on the UI. This implementation prevented people from adding a more sane one in a module. | ||||
* | | | | | make the events more useful by providing the source region | Melanie Thielker | 2010-05-04 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge branch 'careminster' into careminster-presence-refactor | Melanie | 2010-05-04 | 1 | -0/+3 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | sacha | 2010-05-02 | 3 | -36/+81 |
| |\ \ \ \ | |||||
| | * | | | | Fix linking issue introduced in my earlier commit | Melanie Thielker | 2010-04-30 | 1 | -1/+19 |
| | | | | | |