Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-05-05 | 1 | -0/+37 |
|\ | |||||
| * | Plumb the viewer version string through into AgentCircuitData. Now all that | Melanie Thielker | 2010-05-05 | 1 | -0/+11 |
| | | | | | | | | | | | | 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. | ||||
| * | * Added an important comment to warn people not to use MockConsole for ↵ | Teravus Ovares (Dan Olivares) | 2010-05-04 | 1 | -0/+5 |
| | | | | | | | | anything but testing. | ||||
| * | * This should fix the tests failing because of a MainConsole.Instance null ↵ | Teravus Ovares (Dan Olivares) | 2010-05-04 | 1 | -0/+32 |
| | | | | | | | | | | | | reference * Added a MockConsole that doesn't require a handle to System.Console | ||||
* | | Plumb the viewer version string through into AgentCircuitData. Now all that | Melanie Thielker | 2010-05-06 | 1 | -0/+11 |
| | | | | | | | | | | | | 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. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-05-03 | 1 | -0/+11 |
|\ \ | |/ | |||||
| * | Defer sending of CHANGED_OWNER to make it work on rezzed objects and | Melanie | 2010-05-03 | 1 | -0/+11 |
| | | | | | | | | attachments in addition to objects sold in place | ||||
| * | Fix link security issue | Melanie | 2010-04-30 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'careminster' into careminster-presence-refactor | Melanie | 2010-04-30 | 1 | -1/+1 |
|\ \ | |||||
| * \ | Merge branch '0.6.9-post-fixes' into careminster | Melanie | 2010-04-30 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | Fix link security issue | Melanie | 2010-04-30 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch '0.6.9-post-fixes' into careminster | Melanie | 2010-04-19 | 2 | -17/+48 |
| |\ \ \ | | |/ / | |||||
| | * | | Fix http://opensimulator.org/mantis/view.php?id=4657 where ↵ | Justin Clark-Casey (justincc) | 2010-04-16 | 2 | -17/+48 |
| | | | | | | | | | | | | | | | | | | | | | | | | OpenSim.Grid.UserServer.exe fails on startup if no previous config probably appears to occur because mono 2.4.2.3 (and possibly later) erroneously returns a value of 0 for BufferWidth and BufferHeight in some circumstances | ||||
| | * | | Changed the GetTextureModule backport to work with the 0.6.9 codebase | John Hurliman | 2010-04-08 | 1 | -361/+0 |
| | | | | |||||
| | * | | Backported WebUtil.cs from master to 0.6.9-postfixes to fix the build break | John Hurliman | 2010-04-08 | 1 | -0/+361 |
| | | | | |||||
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-04-29 | 1 | -1/+1 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | * Thanks cmickeyb, for a patch that corrects an invalid construction of ↵ | John Hurliman | 2010-04-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Primitive.TextureEntry (a "blank" texture should be initialized with UUID.Zero, not null) | ||||
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-04-27 | 2 | -4/+9 |
|\ \ \ \ | |/ / / | |||||
| * | | | Better error message. | Diva Canto | 2010-04-26 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | John Hurliman | 2010-04-22 | 2 | -17/+48 |
| |\ \ \ | |||||
| * | | | | * Better error logging for failed SimianGrid web service calls | John Hurliman | 2010-04-22 | 1 | -3/+8 |
| | | | | | |||||
* | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-04-19 | 5 | -17/+90 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | Fix http://opensimulator.org/mantis/view.php?id=4657 where ↵ | Justin Clark-Casey (justincc) | 2010-04-16 | 2 | -17/+48 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | OpenSim.Grid.UserServer.exe fails on startup if no previous config probably appears to occur because mono 2.4.2.3 (and possibly later) erroneously returns a value of 0 for BufferWidth and BufferHeight in some circumstances | ||||
| * | | | * Added 32bitLauncher for Robust. Still need to test it on a 64 bit machine. | Diva Canto | 2010-04-14 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | * PrimitiveBaseShape wants to be be committed too -- EOF. | ||||
| * | | | Applying patch from lkalif to add support for inventory links to the ↵ | John Hurliman | 2010-04-13 | 1 | -0/+33 |
| | | | | | | | | | | | | | | | | SimianGrid connectors | ||||
| * | | | thanks lkalif for Mantis #4676 - a patch that adds support for inventory links | dahlia | 2010-04-12 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | Signed-off-by: dahlia <dahliaTrimble@gmail.removeme.com> | ||||
| * | | | minor - add some documentation to PrimitiveBaseShape constructor with ↵ | dahlia | 2010-04-09 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | OpenMetaverse.Primitive parameter | ||||
* | | | | Merge branch 'careminster' into careminster-presence-refactor | Melanie | 2010-04-13 | 1 | -1/+1 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Test commit | Melanie Thielker | 2010-04-05 | 1 | -1/+1 |
| | | | | |||||
| * | | | Bump version number | Melanie Thielker | 2010-04-05 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'careminster' into careminster-presence-refactor | Melanie | 2010-04-05 | 1 | -0/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '0.6.9-post-fixes' into careminster | Melanie | 2010-04-05 | 1 | -0/+1 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | switch flavor to RC1 | Justin Clark-Casey (justincc) | 2010-03-26 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch '0.6.9-post-fixes' into careminster | Melanie | 2010-03-06 | 8 | -23/+93 |
| |\ \ \ | | |/ / | |||||
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-04-05 | 3 | -8/+13 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-04-01 | 3 | -2/+308 |
| |\ \ \ | |||||
| | * | | | First attempt at fixing mantis #4641. It's better but there are now some ↵ | Diva Canto | 2010-03-31 | 2 | -7/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | issues with permissions. (looks like my commit is going to touch CM files, I'm going to let it do it - eof only) | ||||
| | * | | | Committing the LightShare code, which was developed by TomMeta of Meta7. | Melanie | 2010-03-31 | 2 | -2/+305 |
| | | | | | | | | | | | | | | | | | | | | | | | | | This allows scripts to set WindLight parameters for clients connecting to a region. Currently, this is only supported by the Meta7 viewer. | ||||
| * | | | | When saving an oar/iar, don't attempt to write out the data byte array if ↵ | Justin Clark-Casey (justincc) | 2010-03-31 | 1 | -1/+3 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | it's empty On Mono 2.6 (and probably before) this causes a non-obvious IOException | ||||
* | | | | Rename Meta7Windlight to LightShare | Melanie | 2010-03-30 | 1 | -5/+5 |
| | | | | |||||
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-03-30 | 7 | -197/+23 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | John Hurliman | 2010-03-26 | 1 | -2/+2 |
| |\ \ \ | |||||
| | * | | | change trunk version to 0.7.Dev | Justin Clark-Casey (justincc) | 2010-03-26 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | * Fixed a bug with null value handling in WebUtil.BuildQueryString() | John Hurliman | 2010-03-26 | 1 | -2/+6 |
| |/ / / | | | | | | | | | | | | | | | | | * Changed the null check back in estate manager setup but fixed the case for an existing account being found * Implemented SetPassword() in the SimianGrid auth connector | ||||
| * | | | replace recent IModule.GetGroup() with better GetGroupRecord(string name) | Justin Clark-Casey (justincc) | 2010-03-26 | 1 | -2/+0 |
| | | | | |||||
| * | | | minor: Print out port that http servers are using | Justin Clark-Casey (justincc) | 2010-03-25 | 2 | -3/+7 |
| | | | | | | | | | | | | | | | | do this in callers so that we know who is setting up these things | ||||
| * | | | put out full exception stack if something reaches top of base http server ↵ | Justin Clark-Casey (justincc) | 2010-03-25 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | OnRequest() on both mono and .net replace Newtonsoft.Json.XML since the updated copy got accidentally reverted by another commit | ||||
| * | | | Remove the reading of estate_settings.xml and the associated processing of | Melanie | 2010-03-22 | 1 | -187/+7 |
| | | | | | | | | | | | | | | | | | | | | defaults. Adding code to facilitate estate creation / managemment as part of first time start up | ||||
| * | | | Renamed TryGetAvatar to TryGetScenePresence on SceneManager, SceneBase, ↵ | Dan Lake | 2010-03-19 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Scene and SceneGraph. This was the only change in this patch to keep it isolated from other recent changes to the same set of files. | ||||
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-03-18 | 3 | -32/+64 |
|\ \ \ \ | |/ / / |